diff options
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 21 | ||||
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 2 |
3 files changed, 12 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 4cfdff387..e69624832 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -116,7 +116,7 @@ static int trellis_get_coeff_context(const int *scan, int pad, int l) { int bak = token_cache[scan[idx]], pt; token_cache[scan[idx]] = vp9_pt_energy_class[token]; - pt = vp9_get_coef_context(scan, nb, pad, token_cache, idx + 1, l); + pt = get_coef_context(scan, nb, pad, token_cache, idx + 1, l); token_cache[scan[idx]] = bak; return pt; } diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index c2810f9f9..5b4b7522b 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -386,32 +386,31 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb, // single eob token cost += token_costs[0][0][pt][DCT_EOB_TOKEN]; } else { - int t, v, prev_rc = 0; + int v, prev_t; // dc token v = qcoeff_ptr[0]; - t = vp9_dct_value_tokens_ptr[v].token; - cost += token_costs[0][0][pt][t] + vp9_dct_value_cost_ptr[v]; - token_cache[0] = vp9_pt_energy_class[t]; + prev_t = vp9_dct_value_tokens_ptr[v].token; + cost += token_costs[0][0][pt][prev_t] + vp9_dct_value_cost_ptr[v]; + token_cache[0] = vp9_pt_energy_class[prev_t]; // ac tokens for (c = 1; c < eob; c++) { const int rc = scan[c]; - int band = get_coef_band(band_translate, c); + const int band = get_coef_band(band_translate, c); + int t; v = qcoeff_ptr[rc]; t = vp9_dct_value_tokens_ptr[v].token; - pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob); - // as an index at some level - cost += token_costs[!token_cache[prev_rc]][band][pt][t] + - vp9_dct_value_cost_ptr[v]; + pt = get_coef_context(scan, nb, pad, token_cache, c, default_eob); + cost += token_costs[!prev_t][band][pt][t] + vp9_dct_value_cost_ptr[v]; token_cache[rc] = vp9_pt_energy_class[t]; - prev_rc = rc; + prev_t = t; } // eob token if (c < seg_eob) { - pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob); + pt = get_coef_context(scan, nb, pad, token_cache, c, default_eob); cost += token_costs[0][get_coef_band(band_translate, c)][pt] [DCT_EOB_TOKEN]; } diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 885079dc1..abf05c254 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -193,7 +193,7 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize, int v = 0; rc = scan[c]; if (c) - pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob); + pt = get_coef_context(scan, nb, pad, token_cache, c, default_eob); if (c < eob) { v = qcoeff_ptr[rc]; assert(-DCT_MAX_VALUE <= v && v < DCT_MAX_VALUE); |