Commit eee6afe0 authored by Debargha Mukherjee's avatar Debargha Mukherjee

Fixing some compile issues

Fixes a breakage introduced with the latest merge from master and
cleans up a couple of compiler warnings.

Change-Id: Ia55b39ba78e43f6fe52c54d7f34faa4dd6bbbf26
parent 44da65fb
......@@ -407,9 +407,10 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type,
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)
......@@ -446,8 +447,10 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type,
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
......
......@@ -3302,14 +3302,10 @@ static void debug_check_frame_counts(const VP10_COMMON *const cm) {
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment