remove old placeholder implementation of the config file support remove old placeholder implementation of the config file support to prepare for the updated full implementation Change-Id: Iaebb225542c342485ac9419d8721c93273774e48
diff --git a/aom/aom_codec.h b/aom/aom_codec.h index fc0df5b..6773e07 100644 --- a/aom/aom_codec.h +++ b/aom/aom_codec.h
@@ -503,19 +503,6 @@ */ const char *aom_obu_type_to_string(OBU_TYPE type); -/*!\brief Config Options - * - * This type allows to enumerate and control options defined for control - * via config file at runtime. - */ -typedef struct cfg_options { - /*!\brief Reflects if ext_partition should be enabled - * - * If this value is non-zero it enabled the feature - */ - unsigned int ext_partition; -} cfg_options_t; - /*!@} - end defgroup codec*/ #ifdef __cplusplus }
diff --git a/aom/aom_decoder.h b/aom/aom_decoder.h index 70420c3..af20e98 100644 --- a/aom/aom_decoder.h +++ b/aom/aom_decoder.h
@@ -42,7 +42,7 @@ * fields to structures */ #define AOM_DECODER_ABI_VERSION \ - (3 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/ + (4 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/ /*! \brief Decoder capabilities bitfield * @@ -98,7 +98,6 @@ unsigned int w; /**< Width */ unsigned int h; /**< Height */ unsigned int allow_lowbitdepth; /**< Allow use of low-bitdepth coding path */ - cfg_options_t cfg; /**< Options defined per config attributes */ } aom_codec_dec_cfg_t; /**< alias for struct aom_codec_dec_cfg */ /*!\brief Initialize a decoder instance
diff --git a/aom/aom_encoder.h b/aom/aom_encoder.h index 1ee728a..9d02e8c 100644 --- a/aom/aom_encoder.h +++ b/aom/aom_encoder.h
@@ -41,7 +41,7 @@ * fields to structures */ #define AOM_ENCODER_ABI_VERSION \ - (5 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/ + (6 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/ /*! \brief Encoder capabilities bitfield * @@ -723,11 +723,6 @@ * The number of heights specified is given by tile_height_count */ int tile_heights[MAX_TILE_HEIGHTS]; - - /*!\brief Options defined per config file - * - */ - cfg_options_t cfg; } aom_codec_enc_cfg_t; /**< alias for struct aom_codec_enc_cfg */ /*!\brief Initialize an encoder instance
diff --git a/aom/src/aom_encoder.c b/aom/src/aom_encoder.c index 9de8c06..fbe6823 100644 --- a/aom/src/aom_encoder.c +++ b/aom/src/aom_encoder.c
@@ -167,11 +167,6 @@ } } - /* default values */ - if (cfg) { - cfg->cfg.ext_partition = 1; - } - return res; }
diff --git a/apps/aomdec.c b/apps/aomdec.c index f229078..acecc90 100644 --- a/apps/aomdec.c +++ b/apps/aomdec.c
@@ -451,7 +451,7 @@ int opt_yv12 = 0; int opt_i420 = 0; int opt_raw = 0; - aom_codec_dec_cfg_t cfg = { 0, 0, 0, !FORCE_HIGHBITDEPTH_DECODING, { 1 } }; + aom_codec_dec_cfg_t cfg = { 0, 0, 0, !FORCE_HIGHBITDEPTH_DECODING }; unsigned int fixed_output_bit_depth = 0; unsigned int is_annexb = 0; int frames_corrupted = 0;
diff --git a/apps/aomenc.c b/apps/aomenc.c index 6765c5c..4e23aeb 100644 --- a/apps/aomenc.c +++ b/apps/aomenc.c
@@ -158,11 +158,6 @@ ARG_DEF("v", "verbose", 0, "Show encoder parameters"); static const arg_def_t psnrarg = ARG_DEF(NULL, "psnr", 0, "Show PSNR in status line"); -#if CONFIG_FILEOPTIONS -static const arg_def_t use_cfg = ARG_DEF("c", "cfg", 1, "Config file to use"); -static const arg_def_t ext_partition = - ARG_DEF(NULL, "ext-partition", 1, "corresponds to extended partitions"); -#endif static const struct arg_enum_list test_decode_enum[] = { { "off", TEST_DECODE_OFF }, @@ -205,9 +200,6 @@ NULL, "input-chroma-subsampling-y", 1, "chroma subsampling y value."); static const arg_def_t *main_args[] = { &help, -#if CONFIG_FILEOPTIONS - &use_cfg, -#endif &debugmode, &outputfile, &codecarg, @@ -1123,15 +1115,11 @@ /* Parses global config arguments into the AvxEncoderConfig. Note that * argv is modified and overwrites all parsed arguments. */ -static void parse_global_config(struct AvxEncoderConfig *global, int argc, - char ***argv) { +static void parse_global_config(struct AvxEncoderConfig *global, char ***argv) { char **argi, **argj; struct arg arg; const int num_encoder = get_aom_encoder_count(); char **argv_local = (char **)*argv; -#if CONFIG_FILEOPTIONS - int argc_local = argc; -#endif if (num_encoder < 1) die("Error: no valid encoder available\n"); /* Initialize default parameters */ @@ -1141,27 +1129,8 @@ global->color_type = I420; global->csp = AOM_CSP_UNKNOWN; -#if CONFIG_FILEOPTIONS - const char *cfg = NULL; - int cfg_included = 0; -#endif for (argi = argj = argv_local; (*argj = *argi); argi += arg.argv_step) { arg.argv_step = 1; - -#if CONFIG_FILEOPTIONS - if (arg_match(&arg, &use_cfg, argi)) { - if (cfg_included) continue; - cfg = arg.val; - - arg_cfg(&argc_local, &argv_local, cfg); - - *argj = *argi = *argv_local; - argj = argi = argv_local; - *argv = argv_local; - cfg_included = 1; - continue; - } -#endif if (arg_match(&arg, &help, argi)) { show_help(stdout, 0); exit(EXIT_SUCCESS); @@ -1577,10 +1546,6 @@ } else if (arg_match(&arg, &tile_height, argi)) { config->cfg.tile_height_count = arg_parse_list(&arg, config->cfg.tile_heights, MAX_TILE_HEIGHTS); -#if CONFIG_FILEOPTIONS - } else if (arg_match(&arg, &ext_partition, argi)) { - config->cfg.cfg.ext_partition = !!arg_parse_uint(&arg) > 0; -#endif } else if (global->usage == AOM_USAGE_REALTIME && arg_match(&arg, &enable_restoration, argi)) { if (arg_parse_uint(&arg) == 1) { @@ -1857,7 +1822,7 @@ #if CONFIG_AV1_DECODER if (global->test_decode != TEST_DECODE_OFF) { const AvxInterface *decoder = get_aom_decoder_by_name(global->codec->name); - aom_codec_dec_cfg_t cfg = { 0, 0, 0, !FORCE_HIGHBITDEPTH_DECODING, { 1 } }; + aom_codec_dec_cfg_t cfg = { 0, 0, 0, !FORCE_HIGHBITDEPTH_DECODING }; aom_codec_dec_init(&stream->decoder, decoder->codec_interface(), &cfg, 0); if (strcmp(global->codec->name, "av1") == 0) { @@ -2195,13 +2160,9 @@ * codec. */ argv = argv_dup(argc - 1, argv_ + 1); - parse_global_config(&global, argc, &argv); + parse_global_config(&global, &argv); -#if CONFIG_FILEOPTIONS - if (argc < 2) usage_exit(); -#else if (argc < 3) usage_exit(); -#endif switch (global.color_type) { case I420: input.fmt = AOM_IMG_FMT_I420; break;
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index 32ce68f..db4cb36 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -636,7 +636,6 @@ oxcf->init_framerate = 30; oxcf->timing_info_present = 0; } - oxcf->cfg = &cfg->cfg; switch (cfg->g_pass) { case AOM_RC_ONE_PASS: oxcf->pass = 0; break; @@ -2543,7 +2542,6 @@ 0, // tile_height_count { 0 }, // tile_widths { 0 }, // tile_heights - { 1 }, // config file } }, { 1, { @@ -2611,7 +2609,6 @@ 0, // tile_height_count { 0 }, // tile_widths { 0 }, // tile_heights - { 1 }, // config file } }, };
diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c index 66fe5df..6b06ad4 100644 --- a/av1/av1_dx_iface.c +++ b/av1/av1_dx_iface.c
@@ -105,8 +105,6 @@ if (ctx->config.dec) { priv->cfg = *ctx->config.dec; ctx->config.dec = &priv->cfg; - // default values - priv->cfg.cfg.ext_partition = 1; } priv->num_grain_image_frame_buffers = 0; // Turn row_mt on by default. @@ -482,7 +480,6 @@ set_error_detail(ctx, "Failed to allocate frame_worker_data"); return AOM_CODEC_MEM_ERROR; } - frame_worker_data->pbi->common.options = &ctx->cfg.cfg; frame_worker_data->worker_id = i; frame_worker_data->frame_context_ready = 0; frame_worker_data->received_frame = 0;
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h index 06d724b..fafd656 100644 --- a/av1/common/onyxc_int.h +++ b/av1/common/onyxc_int.h
@@ -569,7 +569,6 @@ int64_t txcoeff_cost_timer; int64_t txcoeff_cost_count; #endif - const cfg_options_t *options; int is_decoding; } AV1_COMMON;
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index 5cd464c..191b0b7 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -453,19 +453,12 @@ if (cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_64X64) return BLOCK_64X64; -#if CONFIG_FILEOPTIONS - if (cm->options && cm->options->ext_partition) -#endif - if (cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_128X128) - return BLOCK_128X128; + if (cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_128X128) + return BLOCK_128X128; assert(cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_DYNAMIC); -// TODO(any): Possibly could improve this with a heuristic. -#if CONFIG_FILEOPTIONS - if (cm->options && !cm->options->ext_partition) return BLOCK_64X64; -#endif - + // TODO(any): Possibly could improve this with a heuristic. // When superres / resize is on, 'cm->width / height' can change between // calls, so we don't apply this heuristic there. // Things break if superblock size changes between the first pass and second @@ -2704,7 +2697,6 @@ update_film_grain_parameters(cpi, oxcf); cpi->oxcf = *oxcf; - cpi->common.options = oxcf->cfg; x->e_mbd.bd = (int)seq_params->bit_depth; x->e_mbd.global_motion = cm->global_motion;
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h index cb738ef..44b765c 100644 --- a/av1/encoder/encoder.h +++ b/av1/encoder/encoder.h
@@ -370,7 +370,6 @@ unsigned int full_still_picture_hdr; int enable_dual_filter; unsigned int motion_vector_unit_test; - const cfg_options_t *cfg; int enable_rect_partitions; int enable_ab_partitions; int enable_1to4_partitions;
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 623621f..5a043ec 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -96,7 +96,6 @@ "Coefficient range check.") set_aom_config_var(CONFIG_DENOISE 1 "Denoise/noise modeling support in encoder.") -set_aom_config_var(CONFIG_FILEOPTIONS 1 "Enables encoder config file support.") set_aom_config_var(CONFIG_INSPECTION 0 "Enables bitstream inspection.") set_aom_config_var(CONFIG_INTERNAL_STATS 0 "Enables internal encoder stats.") set_aom_config_var(FORCE_HIGHBITDEPTH_DECODING 0
diff --git a/examples/av1_dec_fuzzer.cc b/examples/av1_dec_fuzzer.cc index 15752a0..1cddc8c 100644 --- a/examples/av1_dec_fuzzer.cc +++ b/examples/av1_dec_fuzzer.cc
@@ -38,9 +38,7 @@ aom_codec_ctx_t codec; // Set thread count in the range [1, 64]. const unsigned int threads = (data[IVF_FILE_HDR_SZ] & 0x3f) + 1; - aom_codec_dec_cfg_t cfg = { - threads, 0, 0, !FORCE_HIGHBITDEPTH_DECODING, { 1 } - }; + aom_codec_dec_cfg_t cfg = { threads, 0, 0, !FORCE_HIGHBITDEPTH_DECODING }; if (aom_codec_dec_init(&codec, codec_interface, &cfg, 0)) { return 0; }
diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc index 168f6a0..5951d6e 100644 --- a/test/invalid_file_test.cc +++ b/test/invalid_file_test.cc
@@ -100,7 +100,7 @@ void RunTest() { const DecodeParam input = GET_PARAM(1); - aom_codec_dec_cfg_t cfg = { 0, 0, 0, !FORCE_HIGHBITDEPTH_DECODING, { 1 } }; + aom_codec_dec_cfg_t cfg = { 0, 0, 0, !FORCE_HIGHBITDEPTH_DECODING }; cfg.threads = input.threads; const std::string filename = input.filename; libaom_test::IVFVideoSource decode_video(filename);