Commit 1fa24467 authored by Debargha Mukherjee's avatar Debargha Mukherjee

Fix assert failure with tx64x64 and ext-partiton

Fixes an assert failure when 32x64 and 64x32 partitions are used
with tx64x64 when ext-partition is also on.

BUG=aomedia:935

Change-Id: I3bf50aeab58ec4ba2c9892e6eb18cf60e425fa42
parent 9511a433
...@@ -1446,7 +1446,9 @@ static INLINE int get_vartx_max_txsize(const MB_MODE_INFO *const mbmi, ...@@ -1446,7 +1446,9 @@ static INLINE int get_vartx_max_txsize(const MB_MODE_INFO *const mbmi,
// a subsampled BLOCK_128X128 then the lookup above will give TX_64X64. That // a subsampled BLOCK_128X128 then the lookup above will give TX_64X64. That
// mustn't be used for the subsampled plane (because it would be bigger than // mustn't be used for the subsampled plane (because it would be bigger than
// a 64x64 luma block) so we round down to TX_32X32. // a 64x64 luma block) so we round down to TX_32X32.
if (subsampled && max_txsize == TX_64X64) max_txsize = TX_32X32; if (subsampled && txsize_sqr_up_map[max_txsize] == TX_64X64) {
max_txsize = TX_32X32;
}
#else #else
(void)subsampled; (void)subsampled;
#endif #endif
......
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