ref: 127836d11f8ad8a267b04547b8f8f4f901fddb31
parent: 3fa1348d5fa06585e40bf402f3c9cd7be7839c3a
parent: 1e3dd49fe389dcbd0745dafa556235d118674515
author: Ronald S. Bultje <rbultje@google.com>
date: Wed Nov 14 04:18:34 EST 2012
Merge "Don't use hybrid transform (ADST) for superblocks." into experimental
--- a/vp9/common/blockd.h
+++ b/vp9/common/blockd.h
@@ -505,6 +505,9 @@
static TX_TYPE get_tx_type_16x16(const MACROBLOCKD *xd, const BLOCKD *b) {TX_TYPE tx_type = DCT_DCT;
if (xd->mode_info_context->mbmi.mode < I8X8_PRED &&
+#if CONFIG_SUPERBLOCKS
+ !xd->mode_info_context->mbmi.encoded_as_sb &&
+#endif
xd->q_index < ACTIVE_HT16) {tx_type = txfm_map(pred_mode_conv(xd->mode_info_context->mbmi.mode));
}
--
⑨