Bug 1380118 - aom: Fix win32 debug build. r=kinetik
Visual Studio 2015u3 fails to compile reconintra.c for win32
debug targets. It's confused by the #if conditional inside
the assert macro expansion. Nathan Froyd tells me this is
undefined bahaviour.
The checks are obsolete upstream. Address the issue by
duplicating the assert calls for each branch of the
conditional.
MozReview-Commit-ID: GSjGsa11xfJ
--- a/third_party/aom/av1/common/reconintra.c
+++ b/third_party/aom/av1/common/reconintra.c
@@ -3113,26 +3113,26 @@ void av1_predict_intra_block(const MACRO
dst, dst_stride, col_off, row_off, plane);
#if CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX || CONFIG_EXT_TX)
if (block_width == tx_size_wide[tx_size] &&
block_height == tx_size_high[tx_size]) { // Most common case.
return; // We are done.
} else {
// Can only happen for large rectangular block sizes as such large
// transform sizes aren't available.
- assert(bsize == BLOCK_32X64
#if CONFIG_EXT_PARTITION
- || bsize == BLOCK_64X128
+ assert(bsize == BLOCK_32X64 || bsize == BLOCK_64X128);
+#else
+ assert(bsize == BLOCK_32X64);
#endif // CONFIG_EXT_PARTITION
- );
- assert(tx_size == TX_32X32
#if CONFIG_TX64X64
- || tx_size == TX64X64
+ assert(tx_size == TX_32X32 || tx_size == TX64X64);
+#else
+ assert(tx_size == TX_32X32);
#endif // CONFIG_TX64X64
- );
// In this case, we continue to the bottom square sub-block.
}
#endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX ||
// CONFIG_EXT_TX)
{
const int half_block_height = block_height >> 1;
const int half_block_height_unit =
half_block_height >> tx_size_wide_log2[0];
@@ -3186,26 +3186,26 @@ void av1_predict_intra_block(const MACRO
dst, dst_stride, col_off, row_off, plane);
#if CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX || CONFIG_EXT_TX)
if (block_width == tx_size_wide[tx_size] &&
block_height == tx_size_high[tx_size]) { // Most common case.
return; // We are done.
} else {
// Can only happen for large rectangular block sizes as such large
// transform sizes aren't available.
- assert(bsize == BLOCK_64X32
#if CONFIG_EXT_PARTITION
- || bsize == BLOCK_128X64
+ assert(bsize == BLOCK_64X32 || bsize == BLOCK_128X64);
+#else
+ assert(bsize == BLOCK_64X32);
#endif // CONFIG_EXT_PARTITION
- );
- assert(tx_size == TX_32X32
#if CONFIG_TX64X64
- || tx_size == TX64X64
+ assert(tx_size == TX_32X32 || tx_size == TX64X64);
+#else
+ assert(tx_size == TX_32X32);
#endif // CONFIG_TX64X64
- );
// In this case, we continue to the right square sub-block.
}
#endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX ||
// CONFIG_EXT_TX)
{
int i;
const int half_block_width = block_width >> 1;
const int half_block_width_unit =