Commit 86da7eba authored by Sebastien Alaiwan's avatar Sebastien Alaiwan
Browse files

decodeframe.c: simplify control flow

Change-Id: I3faecc70004747a10cd51df9dbcb27b7c2d56703
parent 42659162
......@@ -2146,25 +2146,20 @@ static const uint8_t *decode_tiles(AV1Decoder *pbi, const uint8_t *data,
if (n_tiles == 1) {
// Find the end of the single tile buffer
return aom_reader_find_end(&pbi->tile_data->bit_reader);
} else {
// Return the end of the last tile buffer
return tile_buffers[tile_rows - 1][tile_cols - 1].raw_data_end;
}
} else {
// Return the end of the last tile buffer
return tile_buffers[tile_rows - 1][tile_cols - 1].raw_data_end;
}
#endif // CONFIG_EXT_TILE
#if !CONFIG_OBU
{
// Get last tile data.
TileData *const td = pbi->tile_data + tile_cols * tile_rows - 1;
return aom_reader_find_end(&td->bit_reader);
}
// Get last tile data.
TileData *const td = pbi->tile_data + tile_cols * tile_rows - 1;
#else
TileData *const td = pbi->tile_data + endTile;
return aom_reader_find_end(&td->bit_reader);
#endif
#if CONFIG_EXT_TILE
}
#endif // CONFIG_EXT_TILE
return aom_reader_find_end(&td->bit_reader);
}
static void error_handler(void *data) {
......
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