diff options
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 5 | ||||
| -rw-r--r-- | vp9/common/vp9_enums.h | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 36e7e8300..e4c37f5cc 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -53,7 +53,7 @@ static INLINE int combine_entropy_contexts(ENTROPY_CONTEXT a, typedef enum { KEY_FRAME = 0, INTER_FRAME = 1, - NUM_FRAME_TYPES, + FRAME_TYPES, } FRAME_TYPE; typedef enum { diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 56e644460..ebe708e34 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -50,8 +50,7 @@ static const vp9_prob default_if_uv_probs[INTRA_MODES] { 101, 21, 107, 181, 192, 103, 19, 67, 125 } /* y = tm */ }; -static const vp9_prob default_partition_probs[NUM_FRAME_TYPES] - [NUM_PARTITION_CONTEXTS] +static const vp9_prob default_partition_probs[FRAME_TYPES][PARTITION_CONTEXTS] [PARTITION_TYPES - 1] = { { /* frame_type = keyframe */ /* 8x8 -> 4x4 */ @@ -415,7 +414,7 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) { counts->uv_mode[i], pre_fc->uv_mode_prob[i], fc->uv_mode_prob[i], 0); - for (i = 0; i < NUM_PARTITION_CONTEXTS; i++) + for (i = 0; i < PARTITION_CONTEXTS; i++) update_mode_probs(PARTITION_TYPES, vp9_partition_tree, counts->partition[i], pre_fc->partition_prob[INTER_FRAME][i], diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h index 1bf074247..768ff2c94 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -50,7 +50,7 @@ typedef enum PARTITION_TYPE { } PARTITION_TYPE; #define PARTITION_PLOFFSET 4 // number of probability models per block size -#define NUM_PARTITION_CONTEXTS (4 * PARTITION_PLOFFSET) +#define PARTITION_CONTEXTS (4 * PARTITION_PLOFFSET) typedef enum { TX_4X4 = 0, // 4x4 dct transform diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 3111852ee..16eeeb67f 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -40,8 +40,7 @@ typedef struct frame_contexts { vp9_prob y_mode_prob[BLOCK_SIZE_GROUPS][INTRA_MODES - 1]; vp9_prob uv_mode_prob[INTRA_MODES][INTRA_MODES - 1]; - vp9_prob partition_prob[NUM_FRAME_TYPES][NUM_PARTITION_CONTEXTS] - [PARTITION_TYPES - 1]; + vp9_prob partition_prob[FRAME_TYPES][PARTITION_CONTEXTS][PARTITION_TYPES - 1]; vp9_coeff_probs_model coef_probs[TX_SIZES][BLOCK_TYPES]; vp9_prob switchable_interp_prob[SWITCHABLE_FILTERS + 1] [SWITCHABLE_FILTERS - 1]; @@ -58,7 +57,7 @@ typedef struct frame_contexts { typedef struct { unsigned int y_mode[BLOCK_SIZE_GROUPS][INTRA_MODES]; unsigned int uv_mode[INTRA_MODES][INTRA_MODES]; - unsigned int partition[NUM_PARTITION_CONTEXTS][PARTITION_TYPES]; + unsigned int partition[PARTITION_CONTEXTS][PARTITION_TYPES]; vp9_coeff_count_model coef[TX_SIZES][BLOCK_TYPES]; unsigned int eob_branch[TX_SIZES][BLOCK_TYPES][REF_TYPES] [COEF_BANDS][PREV_COEF_CONTEXTS]; |