Commit 566155fe authored by Rupert Swarbrick's avatar Rupert Swarbrick
Browse files

Fix CONFIG_EXT_TILE + CONFIG_LOOPFILTER_LEVEL decoding

This (correctly) triggered a compiler warning. The patch is very
simple, and tries to match the equivalent logic in
loopfilter_frame (in encoder.c)

Change-Id: I62ca11dffe0f5c21f81c1db2e2dcafdb08cef83c
parent f02f8aef
......@@ -1980,8 +1980,13 @@ static void read_tile_info(AV1Decoder *const pbi,
if (cm->large_scale_tile) {
struct loopfilter *lf = &cm->lf;
// Figure out single_tile_decoding by loopfilter_level.
cm->single_tile_decoding = (!lf->filter_level) ? 1 : 0;
// Figure out single_tile_decoding by loopfilter_level.
#if CONFIG_LOOPFILTER_LEVEL
const int no_loopfilter = !(lf->filter_level[0] || lf->filter_level[1]);
#else
const int no_loopfilter = !lf->filter_level;
#endif
cm->single_tile_decoding = no_loopfilter ? 1 : 0;
// Read the tile width/height
#if CONFIG_EXT_PARTITION
if (cm->sb_size == BLOCK_128X128) {
......
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