Commit 4974e528 authored by Thomas Davies's avatar Thomas Davies

TILE_GROUPS: send a tile length when just 1 tile.

Change-Id: I403596a9d96b13276b318c5c1c7921fdd741a163
parent 72712e68
......@@ -2676,11 +2676,13 @@ static void read_tile_info(AV1Decoder *const pbi,
cm->tile_width = ALIGN_POWER_OF_TWO(cm->tile_width, MAX_MIB_SIZE_LOG2);
cm->tile_height = ALIGN_POWER_OF_TWO(cm->tile_height, MAX_MIB_SIZE_LOG2);
// tile size magnitude
if (cm->tile_rows > 1 || cm->tile_cols > 1) {
// tile size magnitude
#if !CONFIG_TILE_GROUPS
if (cm->tile_rows > 1 || cm->tile_cols > 1)
#endif
pbi->tile_size_bytes = aom_rb_read_literal(rb, 2) + 1;
}
#endif // CONFIG_EXT_TILE
#if CONFIG_TILE_GROUPS
// Store an index to the location of the tile group information
pbi->tg_size_bit_offset = rb->bit_offset;
......
......@@ -3431,12 +3431,12 @@ static uint32_t write_tiles(AV1_COMP *const cpi, uint8_t *const dst,
write_uncompressed_header(cpi, wb);
// Write the tile length code. Use full 32 bit length fields for the moment
if (have_tiles) aom_wb_write_literal(wb, 3, 2);
aom_wb_write_literal(wb, 3, 2);
/* Write a placeholder for the number of tiles in each tile group */
tg_params_wb = *wb;
saved_offset = wb->bit_offset;
if (n_log2_tiles) aom_wb_write_literal(wb, 0, n_log2_tiles * 2);
if (have_tiles) aom_wb_write_literal(wb, 0, n_log2_tiles * 2);
/* Write a placeholder for the compressed header length */
comp_hdr_len_wb = *wb;
......
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