diff options
author | Debargha Mukherjee <debargha@google.com> | 2012-09-11 14:52:20 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-09-11 14:52:20 -0700 |
commit | aac982e89c9bc883316025036f074eb6b9d45298 (patch) | |
tree | 760c659d32debf97ec1c0a6ecb5c9e834be4a915 /vp8/common/blockd.h | |
parent | c5af82b7ed6d89a4a12003b8d1c6b4befcadce92 (diff) | |
download | libvpx-aac982e89c9bc883316025036f074eb6b9d45298.tar libvpx-aac982e89c9bc883316025036f074eb6b9d45298.tar.gz libvpx-aac982e89c9bc883316025036f074eb6b9d45298.tar.bz2 libvpx-aac982e89c9bc883316025036f074eb6b9d45298.zip |
Revert "Hybrid transform cleanups"
This reverts commit c5af82b7ed6d89a4a12003b8d1c6b4befcadce92
There was a mismatch bug introduced by this patch. Hence reverting until it is fixed.
Diffstat (limited to 'vp8/common/blockd.h')
-rw-r--r-- | vp8/common/blockd.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index a77ce8709..9862b28e5 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -493,35 +493,7 @@ static void txfm_map(BLOCKD *b, B_PREDICTION_MODE bmode) { break; } } - -static TX_TYPE get_tx_type(MACROBLOCKD *xd, BLOCKD *b) { - TX_TYPE tx_type = DCT_DCT; -#if CONFIG_HYBRIDTRANSFORM16X16 - if (xd->mode_info_context->mbmi.txfm_size == TX_16X16) { - if (xd->mode_info_context->mbmi.mode < I8X8_PRED && - xd->q_index < ACTIVE_HT16) - tx_type = b->bmi.as_mode.tx_type; - return tx_type; - } -#endif -#if CONFIG_HYBRIDTRANSFORM8X8 - if (xd->mode_info_context->mbmi.txfm_size == TX_8X8) { - if (xd->mode_info_context->mbmi.mode == I8X8_PRED) - tx_type = b->bmi.as_mode.tx_type; - return tx_type; - } #endif -#if CONFIG_HYBRIDTRANSFORM - if (xd->mode_info_context->mbmi.txfm_size == TX_4X4) { - if (xd->mode_info_context->mbmi.mode == B_PRED && - xd->q_index < ACTIVE_HT) - tx_type = b->bmi.as_mode.tx_type; - return tx_type; - } -#endif -} -#endif - extern void vp8_build_block_doffsets(MACROBLOCKD *xd); extern void vp8_setup_block_dptrs(MACROBLOCKD *xd); |