diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-03 17:23:03 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-12-03 17:23:03 -0800 |
| commit | 8e89e2f2e0df6bbec5c992d2a87fdb4010e64f07 (patch) | |
| tree | 74111cd4211b5cf8f9ea6092f70ce866befff9df /vp9/encoder/vp9_rdopt.c | |
| parent | 4585b9dbac94121830998ea417f340a22213482d (diff) | |
| download | libvpx-8e89e2f2e0df6bbec5c992d2a87fdb4010e64f07.tar libvpx-8e89e2f2e0df6bbec5c992d2a87fdb4010e64f07.tar.gz libvpx-8e89e2f2e0df6bbec5c992d2a87fdb4010e64f07.tar.bz2 libvpx-8e89e2f2e0df6bbec5c992d2a87fdb4010e64f07.zip | |
Cleaning up vp9_entropy.h file.
Renaming constants for consistency:
DCT_VAL_CATEGORY1 => CATEGORY1_TOKEN
DCT_VAL_CATEGORY2 => CATEGORY2_TOKEN
DCT_VAL_CATEGORY3 => CATEGORY3_TOKEN
DCT_VAL_CATEGORY4 => CATEGORY4_TOKEN
DCT_VAL_CATEGORY5 => CATEGORY5_TOKEN
DCT_VAL_CATEGORY6 => CATEGORY6_TOKEN
DCT_EOB_TOKEN => EOB_TOKEN
DCT_EOB_MODEL_TOKEN => EOB_MODEL_TOKEN
MAX_ENTROPY_TOKENS => ENTROPY_TOKENS
Moving constants:
INTER_MODE_CONTEXTS from vp9_entropy.h to vp9_blockd.h.
EOSB_TOKEN from vp9_entropy.h to vp9_tokenize.h
Change-Id: I5fcbf081318e1d365792b6d290a930c6cb0f3fc2
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 65cf5c797..5feca235d 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -165,8 +165,8 @@ static void fill_token_costs(vp9_coeff_cost *c, vp9_coef_tree); vp9_cost_tokens_skip((int *)c[t][i][j][k][1][l], probs, vp9_coef_tree); - assert(c[t][i][j][k][0][l][DCT_EOB_TOKEN] == - c[t][i][j][k][1][l][DCT_EOB_TOKEN]); + assert(c[t][i][j][k][0][l][EOB_TOKEN] == + c[t][i][j][k][1][l][EOB_TOKEN]); } } @@ -528,7 +528,7 @@ static INLINE int cost_coeffs(MACROBLOCK *x, const int eob = pd->eobs[block]; const int16_t *const qcoeff_ptr = BLOCK_OFFSET(p->qcoeff, block); const int ref = mbmi->ref_frame[0] != INTRA_FRAME; - unsigned int (*token_costs)[2][PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS] = + unsigned int (*token_costs)[2][PREV_COEF_CONTEXTS][ENTROPY_TOKENS] = x->token_costs[tx_size][type][ref]; const ENTROPY_CONTEXT above_ec = !!*A, left_ec = !!*L; uint8_t *p_tok = x->token_cache; @@ -541,7 +541,7 @@ static INLINE int cost_coeffs(MACROBLOCK *x, if (eob == 0) { // single eob token - cost = token_costs[0][0][pt][DCT_EOB_TOKEN]; + cost = token_costs[0][0][pt][EOB_TOKEN]; c = 0; } else { int band_left = *band_count++; @@ -573,7 +573,7 @@ static INLINE int cost_coeffs(MACROBLOCK *x, // eob token if (band_left) { pt = get_coef_context(nb, p_tok, c); - cost += (*token_costs)[0][pt][DCT_EOB_TOKEN]; + cost += (*token_costs)[0][pt][EOB_TOKEN]; } } |