diff options
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
-rw-r--r-- | vp9/decoder/vp9_detokenize.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 9e1df063c..bfdb486b8 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -65,8 +65,8 @@ static int get_signed(BOOL_DECODER *br, int value_to_sign) { #define INCREMENT_COUNT(token) \ do { \ - coef_counts[type][coef_bands[c]][pt][token]++; \ - pt = vp9_prev_token_class[token]; \ + coef_counts[type][coef_bands[c]][pt][token]++; \ + pt = vp9_get_coef_context(&recent_energy, token); \ } while (0) #define WRITE_COEF_CONTINUE(val, token) \ @@ -95,6 +95,7 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, const int lidx = vp9_block2left[txfm_size][block_idx]; ENTROPY_CONTEXT above_ec = A0[aidx] != 0, left_ec = L0[lidx] != 0; FRAME_CONTEXT *const fc = &dx->common.fc; + int recent_energy = 0; int nodc = (type == PLANE_TYPE_Y_NO_DC); int pt, c = nodc; vp9_coeff_probs *coef_probs; |