diff options
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 11 | ||||
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 9 | ||||
| -rw-r--r-- | vp9/decoder/vp9_detokenize.h | 4 |
3 files changed, 2 insertions, 22 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index f0b85fec8..53b415169 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -346,7 +346,7 @@ static void decode_8x8(VP9D_COMP *pbi, MACROBLOCKD *xd, static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, BOOL_DECODER* const bc) { TX_TYPE tx_type; - int i, eobtotal = 0; + int i; MB_PREDICTION_MODE mode = xd->mode_info_context->mbmi.mode; #if 0 // def DEC_DEBUG if (dec_debug) { @@ -398,9 +398,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, xd->mode_info_context->bmi[i].as_mode.context = b->bmi.as_mode.context = vp9_find_bpred_context(xd, b); #endif - if (!xd->mode_info_context->mbmi.mb_skip_coeff) - eobtotal += vp9_decode_coefs_4x4(pbi, xd, bc, PLANE_TYPE_Y_WITH_DC, i); - vp9_intra4x4_predict(xd, b, b_mode, b->predictor); tx_type = get_tx_type_4x4(xd, i); if (tx_type != DCT_DCT) { @@ -413,9 +410,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, *(b->base_dst) + b->dst, 16, b->dst_stride, xd->eobs[i]); } } - if (!xd->mode_info_context->mbmi.mb_skip_coeff) { - vp9_decode_mb_tokens_4x4_uv(pbi, xd, bc); - } vp9_build_intra_predictors_mbuv(xd); xd->itxm_add_uv_block(xd->qcoeff + 16 * 16, xd->block[16].dequant, @@ -812,8 +806,7 @@ static void decode_mb(VP9D_COMP *pbi, MACROBLOCKD *xd, if (xd->mode_info_context->mbmi.mb_skip_coeff) { vp9_reset_mb_tokens_context(xd); } else if (!bool_error(bc)) { - if (mode != B_PRED) - eobtotal = vp9_decode_mb_tokens(pbi, xd, bc); + eobtotal = vp9_decode_mb_tokens(pbi, xd, bc); } //mode = xd->mode_info_context->mbmi.mode; diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index f0fc97909..9db9d42c1 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -531,15 +531,6 @@ static int decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd, return c; } -int vp9_decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd, - BOOL_DECODER* const bc, - PLANE_TYPE type, int i) { - const int segment_id = xd->mode_info_context->mbmi.segment_id; - const int seg_eob = get_eob(xd, segment_id, 16); - - return decode_coefs_4x4(dx, xd, bc, type, i, seg_eob); -} - static int decode_mb_tokens_4x4_uv(VP9D_COMP* const dx, MACROBLOCKD* const xd, BOOL_DECODER* const bc, diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h index 33a34aeae..c9569bf34 100644 --- a/vp9/decoder/vp9_detokenize.h +++ b/vp9/decoder/vp9_detokenize.h @@ -14,10 +14,6 @@ #include "vp9/decoder/vp9_onyxd_int.h" -int vp9_decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd, - BOOL_DECODER* const bc, - PLANE_TYPE type, int i); - int vp9_decode_mb_tokens(VP9D_COMP* const, MACROBLOCKD* const, BOOL_DECODER* const); |