Commit 4f9ead8c authored by Sarah Parker's avatar Sarah Parker
Browse files

Avoid skipping MRC_DCT for 32X32 blocks

The transform search set is being determined based on the square
transform size one level below the block size. MRC_DCT is not
included in the transform set for 16x16 so it will be skipped in
the transform search for 32x32 blocks. This change allows it to
be included in the search.

Change-Id: I82395790dde9288531336a56e93575071d070572
parent f624dd5a
...@@ -4876,8 +4876,12 @@ static void select_tx_type_yrd(const AV1_COMP *cpi, MACROBLOCK *x, ...@@ -4876,8 +4876,12 @@ static void select_tx_type_yrd(const AV1_COMP *cpi, MACROBLOCK *x,
(max_tx_size != TX_32X32 || (is_inter && !USE_MRC_INTER) || (max_tx_size != TX_32X32 || (is_inter && !USE_MRC_INTER) ||
(!is_inter && !USE_MRC_INTRA))) (!is_inter && !USE_MRC_INTRA)))
continue; continue;
#endif // CONFIG_MRC_TX // MRC_DCT won't be included in the tx_set_type determined 1 level below
// a 32X32 block, but we still want to search MRC_DCT
if (!av1_ext_tx_used[tx_set_type][tx_type] && tx_type != MRC_DCT) continue;
#else
if (!av1_ext_tx_used[tx_set_type][tx_type]) continue; if (!av1_ext_tx_used[tx_set_type][tx_type]) continue;
#endif // CONFIG_MRC_TX
(void)prune; (void)prune;
// TODO(sarahparker) This speed feature has been temporarily disabled // TODO(sarahparker) This speed feature has been temporarily disabled
// with ext-tx because it is not compatible with the current // with ext-tx because it is not compatible with the current
......
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