Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1380118 - aom: Fix win32 debug build. r=kinetik

Browse Source 
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

--HG--
extra : rebase_source : ae83d06f144ded7c6c9b359d51e1b118ccd365a9
This commit is contained in:
Ralph Giles 2017-08-23 13:06:10 -05:00
parent 1b86417339
commit 33e32f5a2a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
third_party/aom/av1/common/reconintra.c vendored
View File

@ -3118,16 +3118,16 @@ void av1_predict_intra_block(const MACROBLOCKD *xd, int wpx, int hpx,
} else { } else {
// Can only happen for large rectangular block sizes as such large // Can only happen for large rectangular block sizes as such large
// transform sizes aren't available. // transform sizes aren't available.
assert(bsize == BLOCK_32X64
#if CONFIG_EXT_PARTITION #if CONFIG_EXT_PARTITION
|| bsize == BLOCK_64X128 assert(bsize == BLOCK_32X64 || bsize == BLOCK_64X128);
#else
assert(bsize == BLOCK_32X64);
#endif // CONFIG_EXT_PARTITION #endif // CONFIG_EXT_PARTITION
);
assert(tx_size == TX_32X32
#if CONFIG_TX64X64 #if CONFIG_TX64X64
|| tx_size == TX64X64 assert(tx_size == TX_32X32 || tx_size == TX64X64);
#else
assert(tx_size == TX_32X32);
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
);
// In this case, we continue to the bottom square sub-block. // In this case, we continue to the bottom square sub-block.
} }
#endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX || #endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX ||
@ -3191,16 +3191,16 @@ void av1_predict_intra_block(const MACROBLOCKD *xd, int wpx, int hpx,
} else { } else {
// Can only happen for large rectangular block sizes as such large // Can only happen for large rectangular block sizes as such large
// transform sizes aren't available. // transform sizes aren't available.
assert(bsize == BLOCK_64X32
#if CONFIG_EXT_PARTITION #if CONFIG_EXT_PARTITION
|| bsize == BLOCK_128X64 assert(bsize == BLOCK_64X32 || bsize == BLOCK_128X64);
#else
assert(bsize == BLOCK_64X32);
#endif // CONFIG_EXT_PARTITION #endif // CONFIG_EXT_PARTITION
);
assert(tx_size == TX_32X32
#if CONFIG_TX64X64 #if CONFIG_TX64X64
|| tx_size == TX64X64 assert(tx_size == TX_32X32 || tx_size == TX64X64);
#else
assert(tx_size == TX_32X32);
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
);
// In this case, we continue to the right square sub-block. // In this case, we continue to the right square sub-block.
} }
#endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX || #endif // CONFIG_RECT_INTRA_PRED && CONFIG_RECT_TX && (CONFIG_VAR_TX ||