diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-01-14 14:37:53 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-01-14 15:47:25 -0800 |
| commit | c9071601a251d773e95eeb5f94aff919174de398 (patch) | |
| tree | cc9b5d1c84cdc6a9727d5fea6b0b4cda36e0a2c5 /vp9/decoder/vp9_decodframe.c | |
| parent | 741fbe96562ab91f617069e80e45ecb72a2349e2 (diff) | |
| download | libvpx-c9071601a251d773e95eeb5f94aff919174de398.tar libvpx-c9071601a251d773e95eeb5f94aff919174de398.tar.gz libvpx-c9071601a251d773e95eeb5f94aff919174de398.tar.bz2 libvpx-c9071601a251d773e95eeb5f94aff919174de398.zip | |
Remove compound intra-intra experiment.
This experiment gives little gains and adds relatively much code
complexity (and it hinders other experiments), so let's get rid of
it.
Change-Id: Id25e79a137a1b8a01138aa27a1fa0ba4a2df274a
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 685491ff5..361de33b9 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -418,9 +418,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, assert(get_2nd_order_usage(xd) == 0); for (i = 0; i < 16; i++) { int b_mode; -#if CONFIG_COMP_INTRA_PRED - int b_mode2; -#endif BLOCKD *b = &xd->block[i]; b_mode = xd->mode_info_context->bmi[i].as_mode.first; #if CONFIG_NEWBINTRAMODES @@ -429,17 +426,8 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, #endif if (!xd->mode_info_context->mbmi.mb_skip_coeff) eobtotal += vp9_decode_coefs_4x4(pbi, xd, bc, PLANE_TYPE_Y_WITH_DC, i); -#if CONFIG_COMP_INTRA_PRED - b_mode2 = xd->mode_info_context->bmi[i].as_mode.second; - if (b_mode2 == (B_PREDICTION_MODE)(B_DC_PRED - 1)) { -#endif - vp9_intra4x4_predict(b, b_mode, b->predictor); -#if CONFIG_COMP_INTRA_PRED - } else { - vp9_comp_intra4x4_predict(b, b_mode, b_mode2, b->predictor); - } -#endif + vp9_intra4x4_predict(b, b_mode, b->predictor); tx_type = get_tx_type_4x4(xd, b); if (tx_type != DCT_DCT) { vp9_ht_dequant_idct_add_c(tx_type, b->qcoeff, |