diff options
author | Deb Mukherjee <debargha@google.com> | 2012-09-11 19:36:28 -0700 |
---|---|---|
committer | Deb Mukherjee <debargha@google.com> | 2012-09-11 20:53:13 -0700 |
commit | d406334f2712a1ec1bef890b2397927918a84e48 (patch) | |
tree | 3fef284acc547facadbcbb89c00faa19416bdf1d /vp8/encoder/encodeframe.c | |
parent | d4c329c4dae197a857fff28e8b1c99fdc6b2abc6 (diff) | |
download | libvpx-d406334f2712a1ec1bef890b2397927918a84e48.tar libvpx-d406334f2712a1ec1bef890b2397927918a84e48.tar.gz libvpx-d406334f2712a1ec1bef890b2397927918a84e48.tar.bz2 libvpx-d406334f2712a1ec1bef890b2397927918a84e48.zip |
Cleanups for hybrid transform
Some cleanups on the transform size and type selection logic.
Change-Id: If2e9675459482242cf83b4f7de7634505e3f6dac
Diffstat (limited to 'vp8/encoder/encodeframe.c')
-rw-r--r-- | vp8/encoder/encodeframe.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index bbbbc7870..e25b64305 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1833,7 +1833,6 @@ void vp8cx_encode_intra_macro_block(VP8_COMP *cpi, else #endif if (cpi->common.txfm_mode == ALLOW_8X8 - && mbmi->mode != I8X8_PRED && mbmi->mode != B_PRED) { mbmi->txfm_size = TX_8X8; cpi->t8x8_count++; @@ -1930,7 +1929,6 @@ void vp8cx_encode_inter_macroblock (VP8_COMP *cpi, MACROBLOCK *x, } else #endif if (cpi->common.txfm_mode == ALLOW_8X8 - && mbmi->mode != I8X8_PRED && mbmi->mode != B_PRED && mbmi->mode != SPLITMV) { mbmi->txfm_size = TX_8X8; @@ -2111,7 +2109,6 @@ void vp8cx_encode_inter_superblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, /* test code: set transform size based on mode selection */ if (cpi->common.txfm_mode == ALLOW_8X8 - && x->e_mbd.mode_info_context->mbmi.mode != I8X8_PRED && x->e_mbd.mode_info_context->mbmi.mode != B_PRED && x->e_mbd.mode_info_context->mbmi.mode != SPLITMV) { x->e_mbd.mode_info_context->mbmi.txfm_size = TX_8X8; |