Remove CONFIG_EXT_TILE macro The tool is fully adopted. Change-Id: I5da8ca9357c1d78b5dc3a3bb1edc10fbfd840b4f
diff --git a/aomdec.c b/aomdec.c index 0d993a9..9534feb 100644 --- a/aomdec.c +++ b/aomdec.c
@@ -106,7 +106,6 @@ ARG_DEF(NULL, "framestats", 1, "Output per-frame stats (.csv format)"); static const arg_def_t outbitdeptharg = ARG_DEF(NULL, "output-bit-depth", 1, "Output bit-depth for decoded frames"); -#if CONFIG_EXT_TILE static const arg_def_t tilem = ARG_DEF(NULL, "tile-mode", 1, "Tile coding mode " "(0 for normal tile coding mode)"); @@ -116,17 +115,13 @@ static const arg_def_t tilec = ARG_DEF(NULL, "tile-column", 1, "Column index of tile to decode " "(-1 for all columns)"); -#endif // CONFIG_EXT_TILE static const arg_def_t *all_args[] = { &help, &codecarg, &use_yv12, &use_i420, &flipuvarg, &rawvideo, &noblitarg, &progressarg, &limitarg, &skiparg, &postprocarg, &summaryarg, &outputfile, &threadsarg, &frameparallelarg, &verbosearg, &scalearg, &fb_arg, &md5arg, &framestatsarg, - &continuearg, &outbitdeptharg, -#if CONFIG_EXT_TILE - &tilem, &tiler, &tilec, -#endif // CONFIG_EXT_TILE + &continuearg, &outbitdeptharg, &tilem, &tiler, &tilec, NULL }; @@ -515,11 +510,9 @@ int opt_raw = 0; aom_codec_dec_cfg_t cfg = { 0, 0, 0, CONFIG_LOWBITDEPTH, { 1 } }; unsigned int output_bit_depth = 0; -#if CONFIG_EXT_TILE unsigned int tile_mode = 0; int tile_row = -1; int tile_col = -1; -#endif // CONFIG_EXT_TILE int frames_corrupted = 0; int dec_flags = 0; int do_scale = 0; @@ -622,15 +615,12 @@ keep_going = 1; else if (arg_match(&arg, &outbitdeptharg, argi)) { output_bit_depth = arg_parse_uint(&arg); - } -#if CONFIG_EXT_TILE - else if (arg_match(&arg, &tilem, argi)) + } else if (arg_match(&arg, &tilem, argi)) tile_mode = arg_parse_int(&arg); else if (arg_match(&arg, &tiler, argi)) tile_row = arg_parse_int(&arg); else if (arg_match(&arg, &tilec, argi)) tile_col = arg_parse_int(&arg); -#endif // CONFIG_EXT_TILE else argj++; } @@ -736,7 +726,7 @@ if (!quiet) fprintf(stderr, "%s\n", decoder.name); -#if CONFIG_AV1_DECODER && CONFIG_EXT_TILE +#if CONFIG_AV1_DECODER if (aom_codec_control(&decoder, AV1_SET_TILE_MODE, tile_mode)) { fprintf(stderr, "Failed to set decode_tile_mode: %s\n", aom_codec_error(&decoder)); @@ -929,10 +919,8 @@ } } -#if CONFIG_EXT_TILE aom_input_ctx.width = img->d_w; aom_input_ctx.height = img->d_h; -#endif // CONFIG_EXT_TILE #if CONFIG_MONO_VIDEO int num_planes = (!use_y4m && opt_raw && img->monochrome) ? 1 : 3;
diff --git a/aomenc.c b/aomenc.c index dc6f731..b4a39a6 100644 --- a/aomenc.c +++ b/aomenc.c
@@ -269,11 +269,9 @@ ARG_DEF(NULL, "error-resilient", 1, "Enable error resiliency features"); static const arg_def_t lag_in_frames = ARG_DEF(NULL, "lag-in-frames", 1, "Max number of frames to lag"); -#if CONFIG_EXT_TILE static const arg_def_t large_scale_tile = ARG_DEF(NULL, "large-scale-tile", 1, "Large scale tile coding (0: off (default), 1: on)"); -#endif // CONFIG_EXT_TILE #if CONFIG_MONO_VIDEO static const arg_def_t monochrome = ARG_DEF(NULL, "monochrome", 0, "Monochrome video (no chroma planes)"); @@ -299,9 +297,7 @@ &error_resilient, &bitdeptharg, &lag_in_frames, -#if CONFIG_EXT_TILE &large_scale_tile, -#endif // CONFIG_EXT_TILE #if CONFIG_MONO_VIDEO &monochrome, #endif // CONFIG_MONO_VIDEO @@ -421,11 +417,9 @@ ARG_DEF(NULL, "cpu-used", 1, "CPU Used (0..8)"); static const arg_def_t dev_sf_av1 = ARG_DEF(NULL, "dev-sf", 1, "Dev Speed (0..255)"); -#if CONFIG_EXT_TILE static const arg_def_t single_tile_decoding = ARG_DEF(NULL, "single-tile-decoding", 1, "Single tile decoding (0: off (default), 1: on)"); -#endif // CONFIG_EXT_TILE static const arg_def_t tile_cols = ARG_DEF(NULL, "tile-columns", 1, "Number of tile columns to use, log2"); static const arg_def_t tile_rows = @@ -643,9 +637,7 @@ &auto_altref, &sharpness, &static_thresh, -#if CONFIG_EXT_TILE &single_tile_decoding, -#endif // CONFIG_EXT_TILE &tile_cols, &tile_rows, #if CONFIG_DEPENDENT_HORZTILES @@ -708,9 +700,7 @@ AOME_SET_ENABLEAUTOALTREF, AOME_SET_SHARPNESS, AOME_SET_STATIC_THRESHOLD, -#if CONFIG_EXT_TILE AV1E_SET_SINGLE_TILE_DECODING, -#endif // CONFIG_EXT_TILE AV1E_SET_TILE_COLUMNS, AV1E_SET_TILE_ROWS, #if CONFIG_DEPENDENT_HORZTILES @@ -1234,10 +1224,8 @@ config->cfg.g_error_resilient = arg_parse_uint(&arg); } else if (arg_match(&arg, &lag_in_frames, argi)) { config->cfg.g_lag_in_frames = arg_parse_uint(&arg); -#if CONFIG_EXT_TILE } else if (arg_match(&arg, &large_scale_tile, argi)) { config->cfg.large_scale_tile = arg_parse_uint(&arg); -#endif // CONFIG_EXT_TILE #if CONFIG_MONO_VIDEO } else if (arg_match(&arg, &monochrome, argi)) { config->cfg.monochrome = 1; @@ -1456,9 +1444,7 @@ SHOW(g_error_resilient); SHOW(g_pass); SHOW(g_lag_in_frames); -#if CONFIG_EXT_TILE SHOW(large_scale_tile); -#endif // CONFIG_EXT_TILE SHOW(rc_dropframe_thresh); SHOW(rc_resize_mode); SHOW(rc_resize_denominator); @@ -1614,7 +1600,6 @@ aom_codec_dec_cfg_t cfg = { 0, 0, 0, CONFIG_LOWBITDEPTH, { 1 } }; aom_codec_dec_init(&stream->decoder, decoder->codec_interface(), &cfg, 0); -#if CONFIG_EXT_TILE if (strcmp(global->codec->name, "av1") == 0) { aom_codec_control(&stream->decoder, AV1_SET_TILE_MODE, stream->config.cfg.large_scale_tile); @@ -1626,7 +1611,6 @@ aom_codec_control(&stream->decoder, AV1_SET_DECODE_TILE_COL, -1); ctx_exit_on_error(&stream->decoder, "Failed to set decode_tile_col"); } -#endif // CONFIG_EXT_TILE } #endif }
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index bc4455f..6c6c760 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -96,9 +96,7 @@ int render_width; int render_height; aom_superblock_size_t superblock_size; -#if CONFIG_EXT_TILE unsigned int single_tile_decoding; -#endif // CONFIG_EXT_TILE #if CONFIG_FILM_GRAIN int film_grain_test_vector; @@ -177,9 +175,7 @@ 0, // render width 0, // render height AOM_SUPERBLOCK_SIZE_DYNAMIC, // superblock_size -#if CONFIG_EXT_TILE - 0, // Single tile decoding is off by default. -#endif // CONFIG_EXT_TILE + 0, // Single tile decoding is off by default. #if CONFIG_FILM_GRAIN 0, @@ -320,7 +316,6 @@ RANGE_CHECK_HI(extra_cfg, noise_sensitivity, 6); RANGE_CHECK(extra_cfg, superblock_size, AOM_SUPERBLOCK_SIZE_64X64, AOM_SUPERBLOCK_SIZE_DYNAMIC); -#if CONFIG_EXT_TILE RANGE_CHECK_HI(cfg, large_scale_tile, 1); RANGE_CHECK_HI(extra_cfg, single_tile_decoding, 1); @@ -343,25 +338,20 @@ if (extra_cfg->tile_rows != 0) RANGE_CHECK(extra_cfg, tile_rows, 1, 64); } } else { -#endif // CONFIG_EXT_TILE #if CONFIG_MAX_TILE RANGE_CHECK_HI(extra_cfg, tile_columns, 6); RANGE_CHECK_HI(extra_cfg, tile_rows, 6); #else // CONFIG_MAX_TILE - RANGE_CHECK_HI(extra_cfg, tile_columns, 6); - RANGE_CHECK_HI(extra_cfg, tile_rows, 2); + RANGE_CHECK_HI(extra_cfg, tile_columns, 6); + RANGE_CHECK_HI(extra_cfg, tile_rows, 2); #endif // CONFIG_MAX_TILE -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE RANGE_CHECK_HI(cfg, monochrome, 1); -#if CONFIG_EXT_TILE if (cfg->large_scale_tile && extra_cfg->aq_mode) ERROR( "Adaptive quantization are not supported in large scale tile " "coding."); -#endif // CONFIG_EXT_TILE #if CONFIG_DEPENDENT_HORZTILES RANGE_CHECK_HI(extra_cfg, dependent_horz_tiles, 1); @@ -568,10 +558,8 @@ oxcf->using_dist_8x8 = 1; #endif oxcf->num_tile_groups = extra_cfg->num_tg; -#if CONFIG_EXT_TILE // In large-scale tile encoding mode, num_tile_groups is always 1. if (cfg->large_scale_tile) oxcf->num_tile_groups = 1; -#endif // CONFIG_EXT_TILE oxcf->mtu = extra_cfg->mtu_size; oxcf->disable_tempmv = extra_cfg->disable_tempmv; @@ -661,7 +649,6 @@ #if CONFIG_FILM_GRAIN oxcf->film_grain_test_vector = extra_cfg->film_grain_test_vector; #endif -#if CONFIG_EXT_TILE oxcf->large_scale_tile = cfg->large_scale_tile; oxcf->single_tile_decoding = (oxcf->large_scale_tile) ? extra_cfg->single_tile_decoding : 0; @@ -682,12 +669,9 @@ oxcf->tile_columns = AOMMIN(tc, max); oxcf->tile_rows = AOMMIN(tr, max); } else { -#endif // CONFIG_EXT_TILE oxcf->tile_columns = extra_cfg->tile_columns; oxcf->tile_rows = extra_cfg->tile_rows; -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE oxcf->monochrome = cfg->monochrome; oxcf->enable_dual_filter = extra_cfg->use_dual_filter; #if CONFIG_JNT_COMP @@ -706,10 +690,7 @@ #endif #if CONFIG_DEPENDENT_HORZTILES oxcf->dependent_horz_tiles = -#if CONFIG_EXT_TILE - (cfg->large_scale_tile) ? 0 : -#endif // CONFIG_EXT_TILE - extra_cfg->dependent_horz_tiles; + (cfg->large_scale_tile) ? 0 : extra_cfg->dependent_horz_tiles; #endif #if CONFIG_LOOPFILTERING_ACROSS_TILES #if CONFIG_LOOPFILTERING_ACROSS_TILES_EXT @@ -1062,14 +1043,12 @@ return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_EXT_TILE static aom_codec_err_t ctrl_set_single_tile_decoding(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; extra_cfg.single_tile_decoding = CAST(AV1E_SET_SINGLE_TILE_DECODING, args); return update_extra_cfg(ctx, &extra_cfg); } -#endif // CONFIG_EXT_TILE static aom_codec_err_t ctrl_set_aq_mode(aom_codec_alg_priv_t *ctx, va_list args) { @@ -1740,9 +1719,7 @@ { AV1E_SET_MAX_GF_INTERVAL, ctrl_set_max_gf_interval }, { AV1E_SET_RENDER_SIZE, ctrl_set_render_size }, { AV1E_SET_SUPERBLOCK_SIZE, ctrl_set_superblock_size }, -#if CONFIG_EXT_TILE { AV1E_SET_SINGLE_TILE_DECODING, ctrl_set_single_tile_decoding }, -#endif // CONFIG_EXT_TILE #if CONFIG_FILM_GRAIN { AV1E_SET_FILM_GRAIN_TEST_VECTOR, ctrl_set_film_grain_test_vector }, #endif // CONFIG_FILM_GRAIN
diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c index 67738c2..3e663aa 100644 --- a/av1/av1_dx_iface.c +++ b/av1/av1_dx_iface.c
@@ -408,11 +408,9 @@ frame_worker_data->pbi->inv_tile_order = ctx->invert_tile_order; frame_worker_data->pbi->common.frame_parallel_decode = ctx->frame_parallel_decode; -#if CONFIG_EXT_TILE frame_worker_data->pbi->common.large_scale_tile = ctx->tile_mode; frame_worker_data->pbi->dec_tile_row = ctx->decode_tile_row; frame_worker_data->pbi->dec_tile_col = ctx->decode_tile_col; -#endif // CONFIG_EXT_TILE worker->hook = (AVxWorkerHook)frame_worker_hook; if (!winterface->reset(worker)) { set_error_detail(ctx, "Frame Worker thread creation failed"); @@ -468,11 +466,9 @@ frame_worker_data->pbi->inspect_ctx = ctx->inspect_ctx; #endif -#if CONFIG_EXT_TILE frame_worker_data->pbi->common.large_scale_tile = ctx->tile_mode; frame_worker_data->pbi->dec_tile_row = ctx->decode_tile_row; frame_worker_data->pbi->dec_tile_col = ctx->decode_tile_col; -#endif // CONFIG_EXT_TILE worker->had_error = 0; winterface->execute(worker); @@ -758,7 +754,6 @@ if (ctx->need_resync) return NULL; yuvconfig2image(&ctx->img, &sd, frame_worker_data->user_priv); -#if CONFIG_EXT_TILE const int num_planes = av1_num_planes(cm); if (cm->single_tile_decoding && frame_worker_data->pbi->dec_tile_row >= 0) { @@ -794,7 +789,6 @@ ctx->img.d_w = AOMMIN(cm->tile_width, cm->mi_cols - mi_col) * MI_SIZE; } -#endif // CONFIG_EXT_TILE ctx->img.fb_priv = frame_bufs[cm->new_fb_idx].raw_frame_buffer.priv; img = &ctx->img;
diff --git a/av1/common/enums.h b/av1/common/enums.h index 216db7c..916a2b6 100644 --- a/av1/common/enums.h +++ b/av1/common/enums.h
@@ -45,18 +45,8 @@ #define MAX_MIB_MASK (MAX_MIB_SIZE - 1) // Maximum number of tile rows and tile columns -#if CONFIG_EXT_TILE #define MAX_TILE_ROWS 1024 #define MAX_TILE_COLS 1024 -#else -#if CONFIG_MAX_TILE -#define MAX_TILE_ROWS 64 -#define MAX_TILE_COLS 64 -#else -#define MAX_TILE_ROWS 4 -#define MAX_TILE_COLS 64 -#endif -#endif // CONFIG_EXT_TILE #define MAX_VARTX_DEPTH 2
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h index 1290b0e..aeb84a8 100644 --- a/av1/common/onyxc_int.h +++ b/av1/common/onyxc_int.h
@@ -494,18 +494,14 @@ #if CONFIG_DEPENDENT_HORZTILES int tile_row_independent[MAX_TILE_ROWS]; // valid for 0 <= i < tile_rows #endif -#if CONFIG_EXT_TILE int tile_width, tile_height; // In MI units -#endif #else int log2_tile_cols, log2_tile_rows; // Used in non-large_scale_tile_coding. int tile_width, tile_height; // In MI units #endif // CONFIG_MAX_TILE -#if CONFIG_EXT_TILE unsigned int large_scale_tile; unsigned int single_tile_decoding; -#endif // CONFIG_EXT_TILE #if CONFIG_DEPENDENT_HORZTILES int dependent_horz_tiles; @@ -671,10 +667,7 @@ // function doesn't consider whether prev_frame is actually suitable (see // frame_can_use_prev_frame_mvs for that) static INLINE int frame_might_use_prev_frame_mvs(const AV1_COMMON *cm) { - return !cm->error_resilient_mode && -#if CONFIG_EXT_TILE - !cm->large_scale_tile && -#endif // CONFIG_EXT_TILE + return !cm->error_resilient_mode && !cm->large_scale_tile && !frame_is_intra_only(cm); }
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index aec0866..4cf6e8e 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -1521,7 +1521,6 @@ static void read_tile_info(AV1Decoder *const pbi, struct aom_read_bit_buffer *const rb) { AV1_COMMON *const cm = &pbi->common; -#if CONFIG_EXT_TILE cm->single_tile_decoding = 0; if (cm->large_scale_tile) { struct loopfilter *lf = &cm->lf; @@ -1599,7 +1598,6 @@ #endif // CONFIG_MAX_TILE return; } -#endif // CONFIG_EXT_TILE #if CONFIG_MAX_TILE read_tile_info_max_tile(cm, rb); @@ -1666,7 +1664,6 @@ } } -#if CONFIG_EXT_TILE // Reads the next tile returning its size and adjusting '*data' accordingly // based on 'is_last'. static void get_ls_tile_buffer( @@ -1800,7 +1797,6 @@ } } } -#endif // CONFIG_EXT_TILE // Reads the next tile returning its size and adjusting '*data' accordingly // based on 'is_last'. @@ -1912,12 +1908,10 @@ const int tile_rows = cm->tile_rows; const int n_tiles = tile_cols * tile_rows; TileBufferDec(*const tile_buffers)[MAX_TILE_COLS] = pbi->tile_buffers; -#if CONFIG_EXT_TILE const int dec_tile_row = AOMMIN(pbi->dec_tile_row, tile_rows); const int single_row = pbi->dec_tile_row >= 0; const int dec_tile_col = AOMMIN(pbi->dec_tile_col, tile_cols); const int single_col = pbi->dec_tile_col >= 0; -#endif // CONFIG_EXT_TILE int tile_rows_start; int tile_rows_end; int tile_cols_start; @@ -1927,7 +1921,6 @@ int tile_row, tile_col; uint8_t allow_update_cdf; -#if CONFIG_EXT_TILE if (cm->large_scale_tile) { tile_rows_start = single_row ? dec_tile_row : 0; tile_rows_end = single_row ? dec_tile_row + 1 : tile_rows; @@ -1937,7 +1930,6 @@ inv_row_order = pbi->inv_tile_order && !single_row; allow_update_cdf = 0; } else { -#endif // CONFIG_EXT_TILE tile_rows_start = 0; tile_rows_end = tile_rows; tile_cols_start = 0; @@ -1945,9 +1937,7 @@ inv_col_order = pbi->inv_tile_order; inv_row_order = pbi->inv_tile_order; allow_update_cdf = 1; -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE #if CONFIG_CDF_UPDATE_MODE allow_update_cdf = allow_update_cdf && !cm->disable_cdf_update; @@ -1956,11 +1946,9 @@ assert(tile_rows <= MAX_TILE_ROWS); assert(tile_cols <= MAX_TILE_COLS); -#if CONFIG_EXT_TILE if (cm->large_scale_tile) get_ls_tile_buffers(pbi, data, data_end, tile_buffers); else -#endif // CONFIG_EXT_TILE get_tile_buffers(pbi, data, data_end, tile_buffers, startTile, endTile); if (pbi->tile_data == NULL || n_tiles != pbi->allocated_tiles) { @@ -2092,7 +2080,6 @@ if (cm->frame_parallel_decode) av1_frameworker_broadcast(pbi->cur_buf, INT_MAX); -#if CONFIG_EXT_TILE if (cm->large_scale_tile) { if (n_tiles == 1) { // Find the end of the single tile buffer @@ -2101,7 +2088,6 @@ // Return the end of the last tile buffer return tile_buffers[tile_rows - 1][tile_cols - 1].raw_data_end; } -#endif // CONFIG_EXT_TILE TileData *const td = pbi->tile_data + endTile; @@ -3018,12 +3004,8 @@ " state"); } -#if CONFIG_EXT_TILE const int might_bwd_adapt = !(cm->error_resilient_mode || cm->large_scale_tile); -#else - const int might_bwd_adapt = !cm->error_resilient_mode; -#endif // CONFIG_EXT_TILE if (might_bwd_adapt) { cm->refresh_frame_context = aom_rb_read_bit(rb) ? REFRESH_FRAME_CONTEXT_DISABLED @@ -3329,7 +3311,6 @@ read_uncompressed_header(pbi, av1_init_read_bit_buffer(pbi, &rb, data, data_end)); -#if CONFIG_EXT_TILE // If cm->single_tile_decoding = 0, the independent decoding of a single tile // or a section of a frame is not allowed. if (!cm->single_tile_decoding && @@ -3337,7 +3318,6 @@ pbi->dec_tile_row = -1; pbi->dec_tile_col = -1; } -#endif // CONFIG_EXT_TILE pbi->uncomp_hdr_size = aom_rb_bytes_read(&rb); YV12_BUFFER_CONFIG *new_fb = get_frame_new_buffer(cm); @@ -3537,10 +3517,8 @@ } #endif -// Non frame parallel update frame context here. -#if CONFIG_EXT_TILE + // Non frame parallel update frame context here. if (!cm->large_scale_tile) { -#endif // CONFIG_EXT_TILE // TODO(yunqingwang): If cm->frame_parallel_decode = 0, then the following // update always happens. Seems it is done more than necessary. if (!cm->frame_parallel_decode || @@ -3548,11 +3526,9 @@ #if CONFIG_NO_FRAME_CONTEXT_SIGNALING cm->frame_contexts[cm->new_fb_idx] = *cm->fc; #else - if (!cm->error_resilient_mode) - cm->frame_contexts[cm->frame_context_idx] = *cm->fc; + if (!cm->error_resilient_mode) + cm->frame_contexts[cm->frame_context_idx] = *cm->fc; #endif } -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE }
diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c index 9cdb906..e5e7ae1 100644 --- a/av1/decoder/decoder.c +++ b/av1/decoder/decoder.c
@@ -385,12 +385,10 @@ swap_frame_buffers(pbi); -#if CONFIG_EXT_TILE // For now, we only extend the frame borders when the whole frame is decoded. // Later, if needed, extend the border for the decoded tile on the frame // border. if (pbi->dec_tile_row == -1 && pbi->dec_tile_col == -1) -#endif // CONFIG_EXT_TILE // TODO(debargha): Fix encoder side mv range, so that we can use the // inner border extension. As of now use the larger extension. // aom_extend_frame_inner_borders(cm->frame_to_show, num_planes);
diff --git a/av1/decoder/decoder.h b/av1/decoder/decoder.h index 9b4a6ca..5de74ce 100644 --- a/av1/decoder/decoder.h +++ b/av1/decoder/decoder.h
@@ -84,10 +84,8 @@ int hold_ref_buf; // hold the reference buffer. int tile_size_bytes; -#if CONFIG_EXT_TILE int tile_col_size_bytes; int dec_tile_row, dec_tile_col; // always -1 for non-VR tile encoding -#endif // CONFIG_EXT_TILE #if CONFIG_ACCOUNTING int acct_enabled; Accounting accounting;
diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c index 0a60cda..b1cade1 100644 --- a/av1/decoder/obu.c +++ b/av1/decoder/obu.c
@@ -152,13 +152,11 @@ AV1_COMMON *const cm = &pbi->common; uint32_t saved_bit_offset = rb->bit_offset; -#if CONFIG_EXT_TILE if (pbi->common.large_scale_tile) { *startTile = 0; *endTile = pbi->common.tile_rows * pbi->common.tile_cols - 1; return ((rb->bit_offset - saved_bit_offset + 7) >> 3); } -#endif *startTile = aom_rb_read_literal(rb, cm->log2_tile_rows + cm->log2_tile_cols); *endTile = aom_rb_read_literal(rb, cm->log2_tile_rows + cm->log2_tile_cols);
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 5a93f29..4178ff0 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -2347,7 +2347,6 @@ static void write_tile_info(const AV1_COMMON *const cm, struct aom_write_bit_buffer *wb) { -#if CONFIG_EXT_TILE if (cm->large_scale_tile) { const int tile_width = ALIGN_POWER_OF_TWO(cm->tile_width, cm->seq_params.mib_size_log2) >> @@ -2372,30 +2371,26 @@ aom_wb_write_literal(wb, tile_height - 1, 6); } } else { -#endif // CONFIG_EXT_TILE - #if CONFIG_MAX_TILE write_tile_info_max_tile(cm, wb); #else - int min_log2_tile_cols, max_log2_tile_cols, ones; - av1_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols); + int min_log2_tile_cols, max_log2_tile_cols, ones; + av1_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols); - // columns - ones = cm->log2_tile_cols - min_log2_tile_cols; - while (ones--) aom_wb_write_bit(wb, 1); + // columns + ones = cm->log2_tile_cols - min_log2_tile_cols; + while (ones--) aom_wb_write_bit(wb, 1); - if (cm->log2_tile_cols < max_log2_tile_cols) aom_wb_write_bit(wb, 0); + if (cm->log2_tile_cols < max_log2_tile_cols) aom_wb_write_bit(wb, 0); - // rows - aom_wb_write_bit(wb, cm->log2_tile_rows != 0); - if (cm->log2_tile_rows != 0) aom_wb_write_bit(wb, cm->log2_tile_rows != 1); + // rows + aom_wb_write_bit(wb, cm->log2_tile_rows != 0); + if (cm->log2_tile_rows != 0) aom_wb_write_bit(wb, cm->log2_tile_rows != 1); #endif #if CONFIG_DEPENDENT_HORZTILES if (cm->tile_rows > 1) aom_wb_write_bit(wb, cm->dependent_horz_tiles); #endif -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE #if CONFIG_LOOPFILTERING_ACROSS_TILES #if CONFIG_LOOPFILTERING_ACROSS_TILES_EXT @@ -2471,7 +2466,6 @@ } } -#if CONFIG_EXT_TILE static INLINE int find_identical_tile( const int tile_row, const int tile_col, TileBufferEnc (*const tile_buffers)[1024]) { @@ -2522,7 +2516,6 @@ // No identical tile found return 0; } -#endif // CONFIG_EXT_TILE static void write_render_size(const AV1_COMMON *cm, struct aom_write_bit_buffer *wb) { @@ -2839,10 +2832,7 @@ /* Placeholder for actually writing to the bitstream */ seq_params->frame_id_numbers_present_flag = -#if CONFIG_EXT_TILE - cm->large_scale_tile ? 0 : -#endif // CONFIG_EXT_TILE - cm->error_resilient_mode; + cm->large_scale_tile ? 0 : cm->error_resilient_mode; seq_params->frame_id_length = FRAME_ID_LENGTH; seq_params->delta_frame_id_length = DELTA_FRAME_ID_LENGTH; @@ -2995,9 +2985,7 @@ // New function based on HLS R18 static void write_uncompressed_header_obu(AV1_COMP *cpi, -#if CONFIG_EXT_TILE struct aom_write_bit_buffer *saved_wb, -#endif struct aom_write_bit_buffer *wb) { AV1_COMMON *const cm = &cpi->common; MACROBLOCKD *const xd = &cpi->td.mb.e_mbd; @@ -3248,12 +3236,8 @@ cm->frame_type == KEY_FRAME ? 0xFF : get_refresh_mask(cpi); } -#if CONFIG_EXT_TILE const int might_bwd_adapt = !(cm->error_resilient_mode || cm->large_scale_tile); -#else - const int might_bwd_adapt = !cm->error_resilient_mode; -#endif // CONFIG_EXT_TILE if (might_bwd_adapt) { aom_wb_write_bit( @@ -3356,7 +3340,6 @@ #if !CONFIG_TILE_INFO_FIRST write_tile_info(cm, wb); -#if CONFIG_EXT_TILE *saved_wb = *wb; // Write tile size magnitudes if (cm->tile_rows * cm->tile_cols > 1 && cm->large_scale_tile) { @@ -3368,11 +3351,9 @@ // Number of bytes in tile size - 1 aom_wb_write_literal(wb, 0, 2); } -#endif #endif // !CONFIG_TILE_INFO_FIRST } -#if CONFIG_EXT_TILE static int choose_size_bytes(uint32_t size, int spare_msbs) { // Choose the number of bytes required to represent size, without // using the 'spare_msbs' number of most significant bits. @@ -3412,20 +3393,16 @@ int tsb; int tcsb; -#if CONFIG_EXT_TILE if (cm->large_scale_tile) { // The top bit in the tile size field indicates tile copy mode, so we // have 1 less bit to code the tile size tsb = choose_size_bytes(max_tile_size, 1); tcsb = choose_size_bytes(max_tile_col_size, 0); } else { -#endif // CONFIG_EXT_TILE tsb = choose_size_bytes(max_tile_size, 0); tcsb = 4; // This is ignored (void)max_tile_col_size; -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE assert(tsb > 0); assert(tcsb > 0); @@ -3437,7 +3414,6 @@ uint32_t wpos = 0; uint32_t rpos = 0; -#if CONFIG_EXT_TILE if (cm->large_scale_tile) { int tile_row; int tile_col; @@ -3483,7 +3459,6 @@ return wpos; } -#endif // CONFIG_EXT_TILE const int n_tiles = cm->tile_cols * cm->tile_rows; int n; @@ -3510,7 +3485,6 @@ return wpos; } -#endif // CONFIG_EXT_TILE uint32_t write_obu_header(OBU_TYPE obu_type, int obu_extension, uint8_t *const dst) { @@ -3619,20 +3593,14 @@ } static uint32_t write_frame_header_obu(AV1_COMP *cpi, -#if CONFIG_EXT_TILE struct aom_write_bit_buffer *saved_wb, -#endif uint8_t *const dst) { AV1_COMMON *const cm = &cpi->common; struct aom_write_bit_buffer wb = { dst, 0 }; uint32_t total_size = 0; uint32_t uncompressed_hdr_size; - write_uncompressed_header_obu(cpi, -#if CONFIG_EXT_TILE - saved_wb, -#endif - &wb); + write_uncompressed_header_obu(cpi, saved_wb, &wb); if (cm->show_existing_frame) { total_size = aom_wb_bytes_written(&wb); @@ -3640,11 +3608,8 @@ } #if !CONFIG_TILE_INFO_FIRST -// write the tile length code (Always 4 bytes for now) -#if CONFIG_EXT_TILE - if (!cm->large_scale_tile) -#endif - aom_wb_write_literal(&wb, 3, 2); + // write the tile length code (Always 4 bytes for now) + if (!cm->large_scale_tile) aom_wb_write_literal(&wb, 3, 2); #endif uncompressed_hdr_size = aom_wb_bytes_written(&wb); @@ -3667,9 +3632,7 @@ static uint32_t write_tiles_in_tg_obus(AV1_COMP *const cpi, uint8_t *const dst, unsigned int *max_tile_size, unsigned int *max_tile_col_size, -#if CONFIG_EXT_TILE struct aom_write_bit_buffer *saved_wb, -#endif uint8_t obu_extension_header) { AV1_COMMON *const cm = &cpi->common; aom_writer mode_bc; @@ -3684,25 +3647,19 @@ // Fixed size tile groups for the moment const int num_tg_hdrs = cm->num_tg; const int tg_size = -#if CONFIG_EXT_TILE (cm->large_scale_tile) ? 1 - : -#endif // CONFIG_EXT_TILE - (tile_rows * tile_cols + num_tg_hdrs - 1) / num_tg_hdrs; + : (tile_rows * tile_cols + num_tg_hdrs - 1) / num_tg_hdrs; int tile_count = 0; int curr_tg_data_size = 0; uint8_t *data = dst; int new_tg = 1; -#if CONFIG_EXT_TILE const int have_tiles = tile_cols * tile_rows > 1; -#endif cm->largest_tile_id = 0; *max_tile_size = 0; *max_tile_col_size = 0; -#if CONFIG_EXT_TILE if (cm->large_scale_tile) { uint32_t tg_hdr_size = write_obu_header(OBU_TILE_GROUP, 0, data + PRE_OBU_SIZE_BYTES); @@ -3828,7 +3785,6 @@ } return (uint32_t)total_size; } -#endif // CONFIG_EXT_TILE #if CONFIG_OBU_SIZING uint32_t obu_header_size = 0; @@ -3986,19 +3942,13 @@ data += obu_header_size + obu_payload_size + length_field_size; } -#if CONFIG_EXT_TILE struct aom_write_bit_buffer saved_wb; -#endif // write frame header obu, preceded by 4-byte size obu_header_size = write_obu_header(OBU_FRAME_HEADER, obu_extension_header, data + PRE_OBU_SIZE_BYTES); - obu_payload_size = - write_frame_header_obu(cpi, -#if CONFIG_EXT_TILE - &saved_wb, -#endif - data + PRE_OBU_SIZE_BYTES + obu_header_size); + obu_payload_size = write_frame_header_obu( + cpi, &saved_wb, data + PRE_OBU_SIZE_BYTES + obu_header_size); #if CONFIG_OBU_SIZING const size_t length_field_size = @@ -4013,11 +3963,9 @@ #endif // CONFIG_OBU_SIZING data += obu_header_size + obu_payload_size + length_field_size; -#if CONFIG_EXT_TILE // Since length_field_size is determined adaptively after frame header // encoding, saved_wb must be adjusted accordingly. saved_wb.bit_buffer += length_field_size; -#endif #define EXT_TILE_DEBUG 0 #if EXT_TILE_DEBUG @@ -4039,10 +3987,7 @@ // obu data_size = write_tiles_in_tg_obus(cpi, data, &max_tile_size, &max_tile_col_size, -#if CONFIG_EXT_TILE - &saved_wb, -#endif - obu_extension_header); + &saved_wb, obu_extension_header); } data += data_size; *size = data - dst;
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c index 7978132..2e0e3a9 100644 --- a/av1/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c
@@ -3670,11 +3670,7 @@ pre_tok = cpi->tile_tok[tile_row][tile_col]; tile_tok = allocated_tokens( *tile_info, cm->seq_params.mib_size_log2 + MI_SIZE_LOG2, num_planes); -#if CONFIG_EXT_TILE tile_data->allow_update_cdf = !cm->large_scale_tile; -#else - tile_data->allow_update_cdf = 1; -#endif // CONFIG_EXT_TILE #if CONFIG_CDF_UPDATE_MODE tile_data->allow_update_cdf = tile_data->allow_update_cdf && !cm->disable_cdf_update; @@ -4408,9 +4404,7 @@ cm->reference_mode = REFERENCE_MODE_SELECT; cm->interp_filter = SWITCHABLE; -#if CONFIG_EXT_TILE if (cm->large_scale_tile) cm->interp_filter = EIGHTTAP_REGULAR; -#endif // CONFIG_EXT_TILE cm->switchable_motion_mode = 1; @@ -4442,14 +4436,10 @@ if (cm->skip_mode_flag && rdc->skip_mode_used_flag == 0) cm->skip_mode_flag = 0; -#if CONFIG_EXT_TILE if (!cm->large_scale_tile) { -#endif // CONFIG_EXT_TILE if (cm->tx_mode == TX_MODE_SELECT && cpi->td.mb.txb_split_count == 0) cm->tx_mode = TX_MODE_LARGEST; -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE } else { make_consistent_compound_tools(cm); encode_frame_internal(cpi);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index 3ff2386..c16ed82 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -868,7 +868,6 @@ int tile_row, tile_col, num_tiles_in_tg; int tg_row_start, tg_col_start; #endif -#if CONFIG_EXT_TILE if (cpi->oxcf.large_scale_tile) { if (cpi->oxcf.superblock_size != AOM_SUPERBLOCK_SIZE_64X64) { cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 32); @@ -906,44 +905,34 @@ } #endif // CONFIG_MAX_TILE } else { -#endif // CONFIG_EXT_TILE - #if CONFIG_MAX_TILE set_tile_info_max_tile(cpi); (void)cm; #else - int min_log2_tile_cols, max_log2_tile_cols; - av1_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols); + int min_log2_tile_cols, max_log2_tile_cols; + av1_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols); - cm->log2_tile_cols = - clamp(cpi->oxcf.tile_columns, min_log2_tile_cols, max_log2_tile_cols); - cm->log2_tile_rows = cpi->oxcf.tile_rows; + cm->log2_tile_cols = + clamp(cpi->oxcf.tile_columns, min_log2_tile_cols, max_log2_tile_cols); + cm->log2_tile_rows = cpi->oxcf.tile_rows; - cm->tile_width = - get_tile_size(cm->mi_cols, cm->log2_tile_cols, &cm->tile_cols); - cm->tile_height = - get_tile_size(cm->mi_rows, cm->log2_tile_rows, &cm->tile_rows); + cm->tile_width = + get_tile_size(cm->mi_cols, cm->log2_tile_cols, &cm->tile_cols); + cm->tile_height = + get_tile_size(cm->mi_rows, cm->log2_tile_rows, &cm->tile_rows); #endif // CONFIG_MAX_TILE -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE #if CONFIG_DEPENDENT_HORZTILES cm->dependent_horz_tiles = cpi->oxcf.dependent_horz_tiles; -#if CONFIG_EXT_TILE if (cm->large_scale_tile) { // May not needed since cpi->oxcf.dependent_horz_tiles is already adjusted. cm->dependent_horz_tiles = 0; } else { -#endif // CONFIG_EXT_TILE if (cm->log2_tile_rows == 0) cm->dependent_horz_tiles = 0; -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE -#if CONFIG_EXT_TILE if (!cm->large_scale_tile) { -#endif // CONFIG_EXT_TILE if (cpi->oxcf.mtu == 0) { cm->num_tg = cpi->oxcf.num_tile_groups; } else { @@ -965,9 +954,7 @@ cm->tile_group_start_col[tile_row][tile_col] = tg_col_start; } } -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE #endif #if CONFIG_LOOPFILTERING_ACROSS_TILES @@ -2962,10 +2949,8 @@ (oxcf->error_resilient_mode || oxcf->frame_parallel_decoding_mode) ? REFRESH_FRAME_CONTEXT_DISABLED : REFRESH_FRAME_CONTEXT_BACKWARD; -#if CONFIG_EXT_TILE if (oxcf->large_scale_tile) cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED; -#endif // CONFIG_EXT_TILE #if !CONFIG_NO_FRAME_CONTEXT_SIGNALING cm->reset_frame_context = RESET_FRAME_CONTEXT_NONE; @@ -2997,14 +2982,10 @@ rc->worst_quality = cpi->oxcf.worst_allowed_q; rc->best_quality = cpi->oxcf.best_allowed_q; -#if CONFIG_EXT_TILE if (!oxcf->large_scale_tile) -#endif // CONFIG_EXT_TILE cm->interp_filter = cpi->sf.default_interp_filter; -#if CONFIG_EXT_TILE else cm->interp_filter = EIGHTTAP_REGULAR; -#endif // CONFIG_EXT_TILE cm->switchable_motion_mode = 1; @@ -4871,21 +4852,14 @@ int no_loopfilter = 0; int no_restoration = !cpi->oxcf.using_restoration; - if (is_lossless_requested(&cpi->oxcf) -#if CONFIG_EXT_TILE - || cm->large_scale_tile -#endif // CONFIG_EXT_TILE - ) { + if (is_lossless_requested(&cpi->oxcf) || cm->large_scale_tile) { no_loopfilter = 1; no_restoration = 1; } int no_cdef = 0; - if (is_lossless_requested(&cpi->oxcf) || !cpi->oxcf.using_cdef -#if CONFIG_EXT_TILE - || cm->large_scale_tile -#endif - ) { + if (is_lossless_requested(&cpi->oxcf) || !cpi->oxcf.using_cdef || + cm->large_scale_tile) { no_cdef = 1; } @@ -5641,10 +5615,8 @@ // Only reset the current context. cm->reset_frame_context = RESET_FRAME_CONTEXT_CURRENT; } -#if CONFIG_EXT_TILE if (cpi->oxcf.large_scale_tile) cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED; -#endif // CONFIG_EXT_TILE #endif // !CONFIG_NO_FRAME_CONTEXT_SIGNALING } if (cpi->oxcf.mtu == 0) { @@ -5655,11 +5627,9 @@ cm->num_tg = DEFAULT_MAX_NUM_TG; } -#if CONFIG_EXT_TILE cm->large_scale_tile = cpi->oxcf.large_scale_tile; cm->single_tile_decoding = cpi->oxcf.single_tile_decoding; if (cm->large_scale_tile) cm->seq_params.frame_id_numbers_present_flag = 0; -#endif // CONFIG_EXT_TILE cm->seq_params.monochrome = oxcf->monochrome; @@ -6438,10 +6408,8 @@ (oxcf->error_resilient_mode || oxcf->frame_parallel_decoding_mode) ? REFRESH_FRAME_CONTEXT_DISABLED : REFRESH_FRAME_CONTEXT_BACKWARD; -#if CONFIG_EXT_TILE if (oxcf->large_scale_tile) cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED; -#endif // CONFIG_EXT_TILE cpi->refresh_last_frame = 1; cpi->refresh_golden_frame = 0; @@ -6762,20 +6730,15 @@ #endif -#if CONFIG_EXT_TILE if (!cm->large_scale_tile) { -#endif // CONFIG_EXT_TILE #if CONFIG_NO_FRAME_CONTEXT_SIGNALING cm->frame_contexts[cm->new_fb_idx] = *cm->fc; #else - if (!cm->error_resilient_mode) - cm->frame_contexts[cm->frame_context_idx] = *cm->fc; + if (!cm->error_resilient_mode) + cm->frame_contexts[cm->frame_context_idx] = *cm->fc; #endif // CONFIG_NO_FRAME_CONTEXT_SIGNALING -#if CONFIG_EXT_TILE } -#endif // CONFIG_EXT_TILE -#if CONFIG_EXT_TILE #define EXT_TILE_DEBUG 0 #if EXT_TILE_DEBUG if (cm->large_scale_tile && oxcf->pass == 2) { @@ -6788,7 +6751,6 @@ } #endif // EXT_TILE_DEBUG #undef EXT_TILE_DEBUG -#endif // CONFIG_EXT_TILE #if CONFIG_FILM_GRAIN_SHOWEX cm->showable_frame = !cm->show_frame && cm->showable_frame; #endif
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h index e557468..a87a8ed 100644 --- a/av1/encoder/encoder.h +++ b/av1/encoder/encoder.h
@@ -305,10 +305,8 @@ uint8_t cdf_update_mode; #endif // CONFIG_CDF_UPDATE_MODE aom_superblock_size_t superblock_size; -#if CONFIG_EXT_TILE unsigned int large_scale_tile; unsigned int single_tile_decoding; -#endif // CONFIG_EXT_TILE int monochrome; int enable_dual_filter; unsigned int motion_vector_unit_test;
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 48a5ebe..792941d 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -97,7 +97,6 @@ set(CONFIG_ENTROPY_STATS 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_DELTA_Q 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_INTRA_MOD2 1 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_EXT_TILE 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_EXT_WARPED_MOTION 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_FAST_SGR 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_FILM_GRAIN 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc index dd4bca4..5174520 100644 --- a/test/encode_test_driver.cc +++ b/test/encode_test_driver.cc
@@ -34,21 +34,6 @@ res = aom_codec_enc_init(&encoder_, CodecInterface(), &cfg_, init_flags_); ASSERT_EQ(AOM_CODEC_OK, res) << EncoderError(); - -#if CONFIG_AV1_ENCODER - if (CodecInterface() == &aom_codec_av1_cx_algo) { -// Default to 1 tile column for AV1. With CONFIG_EXT_TILE, the -// default is already the largest possible tile size -#if !CONFIG_EXT_TILE - const int log2_tile_columns = 0; - res = aom_codec_control_(&encoder_, AV1E_SET_TILE_COLUMNS, - log2_tile_columns); - ASSERT_EQ(AOM_CODEC_OK, res) << EncoderError(); -#endif // !CONFIG_EXT_TILE - } else -#endif - { - } } } @@ -226,7 +211,7 @@ dec_init_flags |= AOM_CODEC_USE_INPUT_FRAGMENTS; testing::internal::scoped_ptr<Decoder> decoder( codec_->CreateDecoder(dec_cfg, dec_init_flags)); -#if CONFIG_AV1_DECODER && CONFIG_EXT_TILE +#if CONFIG_AV1_DECODER if (decoder->IsAV1()) { // Set dec_cfg.tile_row = -1 and dec_cfg.tile_col = -1 so that the whole // frame is decoded.
diff --git a/test/ethread_test.cc b/test/ethread_test.cc index 08beb11..6c6fc01 100644 --- a/test/ethread_test.cc +++ b/test/ethread_test.cc
@@ -170,20 +170,20 @@ }; TEST_P(AVxEncoderThreadTest, EncoderResultTest) { -#if CONFIG_AV1 && CONFIG_EXT_TILE +#if CONFIG_AV1 cfg_.large_scale_tile = 0; decoder_->Control(AV1_SET_TILE_MODE, 0); -#endif // CONFIG_AV1 && CONFIG_EXT_TILE +#endif // CONFIG_AV1 DoTest(); } class AVxEncoderThreadTestLarge : public AVxEncoderThreadTest {}; TEST_P(AVxEncoderThreadTestLarge, EncoderResultTest) { -#if CONFIG_AV1 && CONFIG_EXT_TILE +#if CONFIG_AV1 cfg_.large_scale_tile = 0; decoder_->Control(AV1_SET_TILE_MODE, 0); -#endif // CONFIG_AV1 && CONFIG_EXT_TILE +#endif // CONFIG_AV1 DoTest(); } @@ -198,7 +198,7 @@ ::libaom_test::kOnePassGood), ::testing::Range(0, 2)); -#if CONFIG_AV1 && CONFIG_EXT_TILE +#if CONFIG_AV1 class AVxEncoderThreadLSTest : public AVxEncoderThreadTest { virtual void SetTileSize(libaom_test::Encoder *encoder) { encoder->Control(AV1E_SET_TILE_COLUMNS, 1); @@ -230,5 +230,5 @@ ::testing::Values(::libaom_test::kTwoPassGood, ::libaom_test::kOnePassGood), ::testing::Range(0, 2)); -#endif // CONFIG_AV1 && CONFIG_EXT_TILE +#endif // CONFIG_AV1 } // namespace
diff --git a/test/superframe_test.cc b/test/superframe_test.cc index e6e364f..6a7bc39 100644 --- a/test/superframe_test.cc +++ b/test/superframe_test.cc
@@ -105,9 +105,7 @@ TEST_P(SuperframeTest, TestSuperframeIndexIsOptional) { sf_count_max_ = 0; // early exit on successful test. cfg_.g_lag_in_frames = 25; -#if CONFIG_EXT_TILE cfg_.large_scale_tile = 1; -#endif // CONFIG_EXT_TILE ::libaom_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288, 30, 1, 0, 40); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
diff --git a/test/test.cmake b/test/test.cmake index 3fc1681..8852425 100644 --- a/test/test.cmake +++ b/test/test.cmake
@@ -309,11 +309,9 @@ "${AOM_ROOT}/test/boolcoder_test.cc" "${AOM_ROOT}/test/ec_test.cc") - if (CONFIG_EXT_TILE) set(AOM_UNIT_TEST_COMMON_SOURCES ${AOM_UNIT_TEST_COMMON_SOURCES} "${AOM_ROOT}/test/av1_ext_tile_test.cc") - endif () endif () endif ()
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc index 18b6e90..014ef97 100644 --- a/test/tile_independence_test.cc +++ b/test/tile_independence_test.cc
@@ -125,11 +125,9 @@ // inverted tile ordering. Ensure that the MD5 of the output in both cases // is identical. If so, tiles are considered independent and the test passes. TEST_P(TileIndependenceTest, MD5Match) { -#if CONFIG_EXT_TILE cfg_.large_scale_tile = 0; fw_dec_->Control(AV1_SET_TILE_MODE, 0); inv_dec_->Control(AV1_SET_TILE_MODE, 0); -#endif // CONFIG_EXT_TILE DoTest(); } @@ -141,11 +139,9 @@ }; TEST_P(TileIndependenceTestLarge, MD5Match) { -#if CONFIG_EXT_TILE cfg_.large_scale_tile = 0; fw_dec_->Control(AV1_SET_TILE_MODE, 0); inv_dec_->Control(AV1_SET_TILE_MODE, 0); -#endif // CONFIG_EXT_TILE DoTest(); } @@ -154,7 +150,6 @@ AV1_INSTANTIATE_TEST_CASE(TileIndependenceTestLarge, ::testing::Values(0, 1), ::testing::Values(0, 1)); -#if CONFIG_EXT_TILE class TileIndependenceLSTest : public TileIndependenceTest {}; TEST_P(TileIndependenceLSTest, MD5Match) { @@ -178,5 +173,4 @@ AV1_INSTANTIATE_TEST_CASE(TileIndependenceLSTestLarge, ::testing::Values(1, 2, 32), ::testing::Values(1, 2, 32)); -#endif // CONFIG_EXT_TILE } // namespace