111ca42133
Split macroblock and superblock tokenization and detokenization functions and coefficient-related data structs so that the bitstream layout and related code of superblock coefficients looks less like it's a hack to fit macroblocks in superblocks. In addition, unify chroma transform size selection from luma transform size (i.e. always use the same size, as long as it fits the predictor); in practice, this means 32x32 and 64x64 superblocks using the 16x16 luma transform will now use the 16x16 (instead of the 8x8) chroma transform, and 64x64 superblocks using the 32x32 luma transform will now use the 32x32 (instead of the 16x16) chroma transform. Lastly, add a trellis optimize function for 32x32 transform blocks. HD gains about 0.3%, STDHD about 0.15% and derf about 0.1%. There's a few negative points here and there that I might want to analyze a little closer. Change-Id: Ibad7c3ddfe1acfc52771dfc27c03e9783e054430
146 lines
5.7 KiB
C
146 lines
5.7 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef VP9_COMMON_VP9_ENTROPY_H_
|
|
#define VP9_COMMON_VP9_ENTROPY_H_
|
|
|
|
#include "vpx/vpx_integer.h"
|
|
#include "vp9/common/vp9_treecoder.h"
|
|
#include "vp9/common/vp9_blockd.h"
|
|
#include "vp9/common/vp9_common.h"
|
|
#include "vp9/common/vp9_coefupdateprobs.h"
|
|
|
|
extern const int vp9_i8x8_block[4];
|
|
|
|
/* Coefficient token alphabet */
|
|
|
|
#define ZERO_TOKEN 0 /* 0 Extra Bits 0+0 */
|
|
#define ONE_TOKEN 1 /* 1 Extra Bits 0+1 */
|
|
#define TWO_TOKEN 2 /* 2 Extra Bits 0+1 */
|
|
#define THREE_TOKEN 3 /* 3 Extra Bits 0+1 */
|
|
#define FOUR_TOKEN 4 /* 4 Extra Bits 0+1 */
|
|
#define DCT_VAL_CATEGORY1 5 /* 5-6 Extra Bits 1+1 */
|
|
#define DCT_VAL_CATEGORY2 6 /* 7-10 Extra Bits 2+1 */
|
|
#define DCT_VAL_CATEGORY3 7 /* 11-18 Extra Bits 3+1 */
|
|
#define DCT_VAL_CATEGORY4 8 /* 19-34 Extra Bits 4+1 */
|
|
#define DCT_VAL_CATEGORY5 9 /* 35-66 Extra Bits 5+1 */
|
|
#define DCT_VAL_CATEGORY6 10 /* 67+ Extra Bits 13+1 */
|
|
#define DCT_EOB_TOKEN 11 /* EOB Extra Bits 0+0 */
|
|
#define MAX_ENTROPY_TOKENS 12
|
|
#define ENTROPY_NODES 11
|
|
#define EOSB_TOKEN 127 /* Not signalled, encoder only */
|
|
|
|
#define INTER_MODE_CONTEXTS 7
|
|
|
|
extern const vp9_tree_index vp9_coef_tree[];
|
|
|
|
extern struct vp9_token_struct vp9_coef_encodings[MAX_ENTROPY_TOKENS];
|
|
|
|
typedef struct {
|
|
vp9_tree_p tree;
|
|
const vp9_prob *prob;
|
|
int Len;
|
|
int base_val;
|
|
} vp9_extra_bit_struct;
|
|
|
|
extern vp9_extra_bit_struct vp9_extra_bits[12]; /* indexed by token value */
|
|
|
|
#define PROB_UPDATE_BASELINE_COST 7
|
|
|
|
#define MAX_PROB 255
|
|
#define DCT_MAX_VALUE 16384
|
|
|
|
/* Coefficients are predicted via a 3-dimensional probability table. */
|
|
|
|
/* Outside dimension. 0 = Y with DC, 1 = UV */
|
|
#define BLOCK_TYPES 2
|
|
#define REF_TYPES 2 // intra=0, inter=1
|
|
|
|
/* Middle dimension reflects the coefficient position within the transform. */
|
|
#define COEF_BANDS 6
|
|
|
|
/* Inside dimension is measure of nearby complexity, that reflects the energy
|
|
of nearby coefficients are nonzero. For the first coefficient (DC, unless
|
|
block type is 0), we look at the (already encoded) blocks above and to the
|
|
left of the current block. The context index is then the number (0,1,or 2)
|
|
of these blocks having nonzero coefficients.
|
|
After decoding a coefficient, the measure is determined by the size of the
|
|
most recently decoded coefficient.
|
|
Note that the intuitive meaning of this measure changes as coefficients
|
|
are decoded, e.g., prior to the first token, a zero means that my neighbors
|
|
are empty while, after the first token, because of the use of end-of-block,
|
|
a zero means we just decoded a zero and hence guarantees that a non-zero
|
|
coefficient will appear later in this block. However, this shift
|
|
in meaning is perfectly OK because our context depends also on the
|
|
coefficient band (and since zigzag positions 0, 1, and 2 are in
|
|
distinct bands). */
|
|
|
|
/*# define DC_TOKEN_CONTEXTS 3*/ /* 00, 0!0, !0!0 */
|
|
#define PREV_COEF_CONTEXTS 6
|
|
|
|
typedef unsigned int vp9_coeff_count[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
|
|
[MAX_ENTROPY_TOKENS];
|
|
typedef unsigned int vp9_coeff_stats[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
|
|
[ENTROPY_NODES][2];
|
|
typedef vp9_prob vp9_coeff_probs[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
|
|
[ENTROPY_NODES];
|
|
|
|
#define SUBEXP_PARAM 4 /* Subexponential code parameter */
|
|
#define MODULUS_PARAM 13 /* Modulus parameter */
|
|
|
|
struct VP9Common;
|
|
void vp9_default_coef_probs(struct VP9Common *);
|
|
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_4x4[16]);
|
|
|
|
extern DECLARE_ALIGNED(16, const int, vp9_col_scan_4x4[16]);
|
|
extern DECLARE_ALIGNED(16, const int, vp9_row_scan_4x4[16]);
|
|
|
|
extern DECLARE_ALIGNED(64, const int, vp9_default_zig_zag1d_8x8[64]);
|
|
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_16x16[256]);
|
|
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_32x32[1024]);
|
|
|
|
void vp9_coef_tree_initialize(void);
|
|
void vp9_adapt_coef_probs(struct VP9Common *);
|
|
|
|
static INLINE void vp9_reset_mb_tokens_context(MACROBLOCKD* const xd) {
|
|
/* Clear entropy contexts */
|
|
vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));
|
|
vpx_memset(xd->left_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));
|
|
}
|
|
|
|
static INLINE void vp9_reset_sb_tokens_context(MACROBLOCKD* const xd) {
|
|
/* Clear entropy contexts */
|
|
vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * 2);
|
|
vpx_memset(xd->left_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * 2);
|
|
}
|
|
|
|
static INLINE void vp9_reset_sb64_tokens_context(MACROBLOCKD* const xd) {
|
|
/* Clear entropy contexts */
|
|
vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * 4);
|
|
vpx_memset(xd->left_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * 4);
|
|
}
|
|
|
|
extern const int vp9_coef_bands[32];
|
|
extern const int vp9_coef_bands4x4[16];
|
|
|
|
static int get_coef_band(TX_SIZE tx_size, int coef_index) {
|
|
if (tx_size == TX_4X4) {
|
|
return vp9_coef_bands4x4[coef_index];
|
|
} else {
|
|
if (coef_index < 32)
|
|
return vp9_coef_bands[coef_index];
|
|
else
|
|
return 5;
|
|
}
|
|
}
|
|
extern int vp9_get_coef_context(int * recent_energy, int token);
|
|
|
|
#endif // VP9_COMMON_VP9_ENTROPY_H_
|