diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-10 11:20:33 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-10-10 17:05:54 -0700 |
| commit | a7333b0a5b9f9d435bba7b1dce72632ae70c0330 (patch) | |
| tree | e3546c793d78bee95a1973133a157a54d8c0b425 /vp8/decoder/decodemv.c | |
| parent | 239b6a8f3080866de592dcccedf82e694a3a21f3 (diff) | |
| download | libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.tar libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.tar.gz libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.tar.bz2 libvpx-a7333b0a5b9f9d435bba7b1dce72632ae70c0330.zip | |
Merge of the TX_16X16 experiment
Change-Id: I22aa803ffff330622cdb77277e7b196a9766f882
Diffstat (limited to 'vp8/decoder/decodemv.c')
| -rw-r--r-- | vp8/decoder/decodemv.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index ddf5301f9..8a231b220 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -175,18 +175,13 @@ static void vp8_kfread_modes(VP8D_COMP *pbi, m->mbmi.mode <= TM_PRED) { // FIXME(rbultje) code ternary symbol once all experiments are merged m->mbmi.txfm_size = vp8_read(bc, cm->prob_tx[0]); -#if CONFIG_TX16X16 if (m->mbmi.txfm_size != TX_4X4) m->mbmi.txfm_size += vp8_read(bc, cm->prob_tx[1]); -#endif } else #endif -#if CONFIG_TX16X16 if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) { m->mbmi.txfm_size = TX_16X16; - } else -#endif - if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != B_PRED) { + } else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != B_PRED) { m->mbmi.txfm_size = TX_8X8; } else { m->mbmi.txfm_size = TX_4X4; @@ -1290,20 +1285,15 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, (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 CONFIG_TX16X16 if (mbmi->txfm_size != TX_4X4) mbmi->txfm_size += vp8_read(bc, cm->prob_tx[1]); -#endif } else #endif -#if CONFIG_TX16X16 if (cm->txfm_mode >= ALLOW_16X16 && ((mbmi->ref_frame == INTRA_FRAME && mbmi->mode <= TM_PRED) || (mbmi->ref_frame != INTRA_FRAME && mbmi->mode != SPLITMV))) { mbmi->txfm_size = TX_16X16; - } else -#endif - if (cm->txfm_mode >= ALLOW_8X8 && + } else if (cm->txfm_mode >= ALLOW_8X8 && ((mbmi->ref_frame == INTRA_FRAME && mbmi->mode != B_PRED) || (mbmi->ref_frame != INTRA_FRAME && mbmi->mode != SPLITMV))) { mbmi->txfm_size = TX_8X8; |