diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-10 17:18:22 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-10-11 09:26:00 -0700 |
| commit | f39b0f192fed13cc788f76877dd2a6495cfe8dd4 (patch) | |
| tree | 9a548c6d0f23ef74553130669fda64b515d4fca1 /vp8/decoder/decodemv.c | |
| parent | a7333b0a5b9f9d435bba7b1dce72632ae70c0330 (diff) | |
| download | libvpx-f39b0f192fed13cc788f76877dd2a6495cfe8dd4.tar libvpx-f39b0f192fed13cc788f76877dd2a6495cfe8dd4.tar.gz libvpx-f39b0f192fed13cc788f76877dd2a6495cfe8dd4.tar.bz2 libvpx-f39b0f192fed13cc788f76877dd2a6495cfe8dd4.zip | |
Use transform-size selection for i8x8_pred also.
Change-Id: Iecb282fc89f9b5145ef31c5eda294ad42bc32a5d
Diffstat (limited to 'vp8/decoder/decodemv.c')
| -rw-r--r-- | vp8/decoder/decodemv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index 8a231b220..fa15af9e9 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -172,10 +172,10 @@ static void vp8_kfread_modes(VP8D_COMP *pbi, #if CONFIG_TX_SELECT if (cm->txfm_mode == TX_MODE_SELECT && m->mbmi.mb_skip_coeff == 0 && - m->mbmi.mode <= TM_PRED) { + m->mbmi.mode <= I8X8_PRED) { // FIXME(rbultje) code ternary symbol once all experiments are merged m->mbmi.txfm_size = vp8_read(bc, cm->prob_tx[0]); - if (m->mbmi.txfm_size != TX_4X4) + if (m->mbmi.txfm_size != TX_4X4 && m->mbmi.mode != I8X8_PRED) m->mbmi.txfm_size += vp8_read(bc, cm->prob_tx[1]); } else #endif @@ -1281,11 +1281,11 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, #if CONFIG_TX_SELECT if (cm->txfm_mode == TX_MODE_SELECT && mbmi->mb_skip_coeff == 0 && - ((mbmi->ref_frame == INTRA_FRAME && mbmi->mode <= TM_PRED) || + ((mbmi->ref_frame == INTRA_FRAME && mbmi->mode <= I8X8_PRED) || (mbmi->ref_frame != INTRA_FRAME && mbmi->mode != SPLITMV))) { // FIXME(rbultje) code ternary symbol once all experiments are merged mbmi->txfm_size = vp8_read(bc, cm->prob_tx[0]); - if (mbmi->txfm_size != TX_4X4) + if (mbmi->txfm_size != TX_4X4 && mbmi->mode != I8X8_PRED) mbmi->txfm_size += vp8_read(bc, cm->prob_tx[1]); } else #endif |