diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-09-21 14:20:15 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-09-21 16:39:23 -0700 |
| commit | 70e21afb3fac6bb5cdfa4c8063521f5b634c0379 (patch) | |
| tree | 1ec374e31b1cccad9910f6a6ffcefe041fabbf7f /vp8/encoder/encodeframe.c | |
| parent | fff019cea4308fc3c776d7426f315d46a7120ac5 (diff) | |
| download | libvpx-70e21afb3fac6bb5cdfa4c8063521f5b634c0379.tar libvpx-70e21afb3fac6bb5cdfa4c8063521f5b634c0379.tar.gz libvpx-70e21afb3fac6bb5cdfa4c8063521f5b634c0379.tar.bz2 libvpx-70e21afb3fac6bb5cdfa4c8063521f5b634c0379.zip | |
Separating 8x8DCT use from hybridtransform8x8
With this change, even if hybridtransform8x8 experiment is off,
8x8 dct is used for the I8x8 mode. However note that the gains
observed with the hybridtransform8x8 experiment will now be less,
since part of the gain is now merged in.
Change-Id: I9afb3880906fd0a1368a374041fc08efcf060c54
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 0d125ec94..9b793e20a 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1833,9 +1833,6 @@ void vp8cx_encode_intra_macro_block(VP8_COMP *cpi, else #endif if (cpi->common.txfm_mode == ALLOW_8X8 -#if !CONFIG_HYBRIDTRANSFORM8X8 - && mbmi->mode != I8X8_PRED -#endif && mbmi->mode != B_PRED) { mbmi->txfm_size = TX_8X8; cpi->t8x8_count++; @@ -1852,8 +1849,9 @@ void vp8cx_encode_intra_macro_block(VP8_COMP *cpi, else vp8_encode_intra16x16mby(IF_RTCD(&cpi->rtcd), x); - if (mbmi->mode != I8X8_PRED) + if (mbmi->mode != I8X8_PRED) { vp8_encode_intra16x16mbuv(IF_RTCD(&cpi->rtcd), x); + } if (output_enabled) { // Tokenize @@ -1932,9 +1930,6 @@ void vp8cx_encode_inter_macroblock (VP8_COMP *cpi, MACROBLOCK *x, } else #endif if (cpi->common.txfm_mode == ALLOW_8X8 -#if !CONFIG_HYBRIDTRANSFORM8X8 - && mbmi->mode != I8X8_PRED -#endif && mbmi->mode != B_PRED && mbmi->mode != SPLITMV) { mbmi->txfm_size = TX_8X8; @@ -2115,9 +2110,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 -#if !CONFIG_HYBRIDTRANSFORM8X8 - && x->e_mbd.mode_info_context->mbmi.mode != I8X8_PRED -#endif && 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; |