return DCT_DCT;
#if CONFIG_EXT_TX
- if (mbmi->sb_type >= BLOCK_8X8 && plane_type == PLANE_TYPE_Y &&
- ALLOW_INTRA_EXT_TX)
+#if ALLOW_INTRA_EXT_TX
+ if (mbmi->sb_type >= BLOCK_8X8 && plane_type == PLANE_TYPE_Y)
return mbmi->tx_type;
+#endif // ALLOW_INTRA_EXT_TX
#endif // CONFIG_EXT_TX
if (use_ext_intra_mode_info)
return DCT_DCT;
if (mbmi->sb_type >= BLOCK_8X8) {
if (plane_type == PLANE_TYPE_Y) {
- if (is_inter_block(mbmi) || ALLOW_INTRA_EXT_TX)
- return mbmi->tx_type;
+#if !ALLOW_INTRA_EXT_TX
+ if (is_inter_block(mbmi))
+#endif // ALLOW_INTRA_EXT_TX
+ return mbmi->tx_type;
}
if (is_inter_block(mbmi))
// UV Inter only
assert(!memcmp(&cm->counts.tx, &zero_counts.tx, sizeof(cm->counts.tx)));
assert(!memcmp(cm->counts.skip, zero_counts.skip, sizeof(cm->counts.skip)));
assert(!memcmp(&cm->counts.mv, &zero_counts.mv, sizeof(cm->counts.mv)));
-#if CONFIG_EXT_TX
assert(!memcmp(cm->counts.inter_ext_tx, zero_counts.inter_ext_tx,
sizeof(cm->counts.inter_ext_tx)));
assert(!memcmp(cm->counts.intra_ext_tx, zero_counts.intra_ext_tx,
sizeof(cm->counts.intra_ext_tx)));
-#else
- assert(!memcmp(cm->counts.intra_ext_tx, zero_counts.intra_ext_tx,
-#endif // CONFIG_EXT_TX
}
#endif // NDEBUG