MAX_TILE experiment: add explicit tiles This patch is designed to complete the CONFIG_MAX_TILE experiment. It adds the following features: - Explicit tiles of same width can be signalled with command line --tile_width - Explicit tiles of same hieght can be signalled with command line --tile_height - max_tile now works with the depenedent horizontal tiles experiment - additional checking added to ensure maximum number of rows/columns <= 64 - one fix to the tile group code for when the number of tiles is not a power of two Change-Id: I749a68fdb3dcdd8d1ced2b3558f3817e4b832c06
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index 1a946eb..ec35ef2 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -34,8 +34,12 @@ unsigned int noise_sensitivity; unsigned int sharpness; unsigned int static_thresh; - unsigned int tile_columns; - unsigned int tile_rows; + unsigned int tile_columns; // log2 number of tile columns + unsigned int tile_rows; // log2 number of tile rows +#if CONFIG_MAX_TILE + unsigned int tile_width; // tile width in superblocks (if non zero) + unsigned int tile_height; // tile height in superblocks (if non zero) +#endif #if CONFIG_DEPENDENT_HORZTILES unsigned int dependent_horz_tiles; #endif @@ -101,6 +105,10 @@ 0, // static_thresh 0, // tile_columns 0, // tile_rows +#if CONFIG_MAX_TILE + 0, // tile_width + 0, // tile_height +#endif #if CONFIG_DEPENDENT_HORZTILES 0, // Dependent Horizontal tiles #endif @@ -308,6 +316,7 @@ #if CONFIG_MAX_TILE RANGE_CHECK_HI(extra_cfg, tile_columns, 6); RANGE_CHECK_HI(extra_cfg, tile_rows, 6); + RANGE_CHECK_HI(extra_cfg, tile_width, MAX_TILE_WIDTH_SB); #else // CONFIG_MAX_TILE RANGE_CHECK_HI(extra_cfg, tile_columns, 6); RANGE_CHECK_HI(extra_cfg, tile_rows, 2); @@ -629,6 +638,10 @@ } #endif // CONFIG_EXT_TILE +#if CONFIG_MAX_TILE + oxcf->tile_width = extra_cfg->tile_width; + oxcf->tile_height = extra_cfg->tile_height; +#endif #if CONFIG_DEPENDENT_HORZTILES oxcf->dependent_horz_tiles = #if CONFIG_EXT_TILE @@ -773,6 +786,22 @@ extra_cfg.tile_rows = CAST(AV1E_SET_TILE_ROWS, args); return update_extra_cfg(ctx, &extra_cfg); } + +#if CONFIG_MAX_TILE +static aom_codec_err_t ctrl_set_tile_width(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.tile_width = CAST(AV1E_SET_TILE_WIDTH, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_tile_height(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.tile_height = CAST(AV1E_SET_TILE_HEIGHT, args); + return update_extra_cfg(ctx, &extra_cfg); +} +#endif #if CONFIG_DEPENDENT_HORZTILES static aom_codec_err_t ctrl_set_tile_dependent_rows(aom_codec_alg_priv_t *ctx, va_list args) { @@ -1551,6 +1580,10 @@ { AOME_SET_STATIC_THRESHOLD, ctrl_set_static_thresh }, { AV1E_SET_TILE_COLUMNS, ctrl_set_tile_columns }, { AV1E_SET_TILE_ROWS, ctrl_set_tile_rows }, +#if CONFIG_MAX_TILE + { AV1E_SET_TILE_WIDTH, ctrl_set_tile_width }, + { AV1E_SET_TILE_HEIGHT, ctrl_set_tile_height }, +#endif #if CONFIG_DEPENDENT_HORZTILES { AV1E_SET_TILE_DEPENDENT_ROWS, ctrl_set_tile_dependent_rows }, #endif
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h index 795100e..35b1b23 100644 --- a/av1/common/onyxc_int.h +++ b/av1/common/onyxc_int.h
@@ -431,6 +431,9 @@ int log2_tile_rows; // only valid for uniform tiles int tile_col_start_sb[MAX_TILE_COLS + 1]; // valid for 0 <= i <= tile_cols int tile_row_start_sb[MAX_TILE_ROWS + 1]; // valid for 0 <= i <= tile_rows +#if CONFIG_DEPENDENT_HORZTILES + int tile_row_independent[MAX_TILE_ROWS]; // valid for 0 <= i < tile_rows +#endif #else int log2_tile_cols, log2_tile_rows; // Used in non-large_scale_tile_coding. int tile_width, tile_height; // In MI units
diff --git a/av1/common/tile_common.c b/av1/common/tile_common.c index f73c39c..c3dedbf 100644 --- a/av1/common/tile_common.c +++ b/av1/common/tile_common.c
@@ -26,6 +26,11 @@ tile->tg_horz_boundary = (row == cm->tile_group_start_row[row][col] ? 1 : 0); } +#if CONFIG_MAX_TILE + if (cm->tile_row_independent[row]) { + tile->tg_horz_boundary = 1; // this tile row is independent + } +#endif } #endif void av1_tile_init(TileInfo *tile, const AV1_COMMON *cm, int row, int col) { @@ -53,8 +58,8 @@ int sb_rows = mi_rows >> MAX_MIB_SIZE_LOG2; cm->min_log2_tile_cols = tile_log2(MAX_TILE_WIDTH_SB, sb_cols); - cm->max_log2_tile_cols = tile_log2(1, sb_cols); - cm->max_log2_tile_rows = tile_log2(1, sb_rows); + cm->max_log2_tile_cols = tile_log2(1, AOMMIN(sb_cols, MAX_TILE_COLS)); + cm->max_log2_tile_rows = tile_log2(1, AOMMIN(sb_rows, MAX_TILE_ROWS)); cm->min_log2_tiles = tile_log2(MAX_TILE_AREA_SB, sb_cols * sb_rows); cm->min_log2_tiles = AOMMAX(cm->min_log2_tiles, cm->min_log2_tile_cols); // TODO(dominic.symes@arm.com): @@ -78,11 +83,13 @@ start_sb += size_sb; } cm->tile_cols = i; - cm->tile_col_start_sb[i] = start_sb; + cm->tile_col_start_sb[i] = sb_cols; cm->min_log2_tile_rows = AOMMAX(cm->min_log2_tiles - cm->log2_tile_cols, 0); + cm->max_tile_height_sb = sb_rows >> cm->min_log2_tile_rows; } else { int max_tile_area_sb = (sb_rows * sb_cols); int max_tile_width_sb = 0; + cm->log2_tile_cols = tile_log2(1, cm->tile_cols); for (i = 0; i < cm->tile_cols; i++) { int size_sb = cm->tile_col_start_sb[i + 1] - cm->tile_col_start_sb[i]; max_tile_width_sb = AOMMAX(max_tile_width_sb, size_sb); @@ -108,10 +115,21 @@ start_sb += size_sb; } cm->tile_rows = i; - cm->tile_row_start_sb[i] = start_sb; + cm->tile_row_start_sb[i] = sb_rows; } else { - // No action + cm->log2_tile_rows = tile_log2(1, cm->tile_rows); } + +#if CONFIG_DEPENDENT_HORZTILES + // Record which tile rows must be indpendent for parallelism + for (i = 0, start_sb = 0; i < cm->tile_rows; i++) { + cm->tile_row_independent[i] = 0; + if (cm->tile_row_start_sb[i + 1] - start_sb > cm->max_tile_height_sb) { + cm->tile_row_independent[i] = 1; + start_sb = cm->tile_row_start_sb[i]; + } + } +#endif } void av1_tile_set_row(TileInfo *tile, const AV1_COMMON *cm, int row) {
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index c03dff9..4716258 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -3246,14 +3246,14 @@ cm->log2_tile_cols++; } } else { - for (i = 0, start_sb = 0; width_sb > 0; i++) { + for (i = 0, start_sb = 0; width_sb > 0 && i < MAX_TILE_COLS; i++) { size_sb = 1 + rb_read_uniform(rb, AOMMIN(width_sb, MAX_TILE_WIDTH_SB)); cm->tile_col_start_sb[i] = start_sb; start_sb += size_sb; width_sb -= size_sb; } cm->tile_cols = i; - cm->tile_col_start_sb[i] = start_sb; + cm->tile_col_start_sb[i] = start_sb + width_sb; } av1_calculate_tile_cols(cm); @@ -3267,7 +3267,7 @@ cm->log2_tile_rows++; } } else { - for (i = 0, start_sb = 0; height_sb > 0; i++) { + for (i = 0, start_sb = 0; height_sb > 0 && i < MAX_TILE_ROWS; i++) { size_sb = 1 + rb_read_uniform(rb, AOMMIN(height_sb, cm->max_tile_height_sb)); cm->tile_row_start_sb[i] = start_sb; @@ -3275,7 +3275,7 @@ height_sb -= size_sb; } cm->tile_rows = i; - cm->tile_row_start_sb[i] = start_sb; + cm->tile_row_start_sb[i] = start_sb + height_sb; } av1_calculate_tile_rows(cm); }
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index ebf2e68..1fe6cbf 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -4180,8 +4180,8 @@ } // Write the final tile group size if (n_log2_tiles) { - aom_wb_overwrite_literal(&tg_params_wb, (1 << n_log2_tiles) - tile_count, - n_log2_tiles); + aom_wb_overwrite_literal( + &tg_params_wb, (tile_cols * tile_rows) - tile_count, n_log2_tiles); aom_wb_overwrite_literal(&tg_params_wb, tile_count - 1, n_log2_tiles); } // Remux if possible. TODO (Thomas Davies): do this for more than one tile
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index fa4093e..9787097 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -866,16 +866,26 @@ static void set_tile_info_max_tile(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; + int i, start_sb; av1_get_tile_limits(cm); - // Configure uniform spaced tiles - // (API is not yet upgraded to general tiles) - cm->uniform_tile_spacing_flag = 1; // configure tile columns - if (cm->uniform_tile_spacing_flag) { + if (cpi->oxcf.tile_width == 0 || cpi->oxcf.tile_height == 0) { + cm->uniform_tile_spacing_flag = 1; cm->log2_tile_cols = AOMMAX(cpi->oxcf.tile_columns, cm->min_log2_tile_cols); cm->log2_tile_cols = AOMMIN(cm->log2_tile_cols, cm->max_log2_tile_cols); + } else { + int mi_cols = ALIGN_POWER_OF_TWO(cm->mi_cols, MAX_MIB_SIZE_LOG2); + int sb_cols = mi_cols >> MAX_MIB_SIZE_LOG2; + int size_sb = AOMMIN(cpi->oxcf.tile_width, MAX_TILE_WIDTH_SB); + cm->uniform_tile_spacing_flag = 0; + for (i = 0, start_sb = 0; start_sb < sb_cols && i < MAX_TILE_COLS; i++) { + cm->tile_col_start_sb[i] = start_sb; + start_sb += size_sb; + } + cm->tile_cols = i; + cm->tile_col_start_sb[i] = sb_cols; } av1_calculate_tile_cols(cm); @@ -883,6 +893,16 @@ if (cm->uniform_tile_spacing_flag) { cm->log2_tile_rows = AOMMAX(cpi->oxcf.tile_rows, cm->min_log2_tile_rows); cm->log2_tile_rows = AOMMIN(cm->log2_tile_rows, cm->max_log2_tile_rows); + } else { + int mi_rows = ALIGN_POWER_OF_TWO(cm->mi_rows, MAX_MIB_SIZE_LOG2); + int sb_rows = mi_rows >> MAX_MIB_SIZE_LOG2; + int size_sb = AOMMIN(cpi->oxcf.tile_height, cm->max_tile_height_sb); + for (i = 0, start_sb = 0; start_sb < sb_rows && i < MAX_TILE_ROWS; i++) { + cm->tile_row_start_sb[i] = start_sb; + start_sb += size_sb; + } + cm->tile_rows = i; + cm->tile_row_start_sb[i] = sb_rows; } av1_calculate_tile_rows(cm); }
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h index df681fb..889d48a 100644 --- a/av1/encoder/encoder.h +++ b/av1/encoder/encoder.h
@@ -269,6 +269,10 @@ int tile_columns; int tile_rows; +#if CONFIG_MAX_TILE + int tile_width; + int tile_height; +#endif #if CONFIG_DEPENDENT_HORZTILES int dependent_horz_tiles; #endif