Change set_encoder_config() to return void set_encoder_config() always returns AOM_CODEC_OK, and none of the four callers check its return value. Also delete a block of code that was commented out when it was added in commit 795ba876072ba38318132a8d6bc9cb2bff0c6326. If we ever want to resurrect that block of code, it should be moved to validate_config(). Change-Id: Icd182755b74709185f38b50801abd6287ff277f4
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index 9ca879e..c20bfdf 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -1008,9 +1008,9 @@ extra_cfg->reduced_tx_type_set = cfg->reduced_tx_type_set; } -static aom_codec_err_t set_encoder_config(AV1EncoderConfig *oxcf, - const aom_codec_enc_cfg_t *cfg, - struct av1_extracfg *extra_cfg) { +static void set_encoder_config(AV1EncoderConfig *oxcf, + const aom_codec_enc_cfg_t *cfg, + struct av1_extracfg *extra_cfg) { if (cfg->encoder_cfg.init_by_cfg_file) { update_default_encoder_config(&cfg->encoder_cfg, extra_cfg); } @@ -1102,16 +1102,6 @@ dec_model_cfg->decoder_model_info_present_flag = 0; dec_model_cfg->display_model_info_present_flag = 1; } else if (extra_cfg->timing_info_type == AOM_TIMING_DEC_MODEL) { - // if( extra_cfg->arnr_strength > 0 ) - // { - // printf("Only --arnr-strength=0 can currently be used with - // --timing-info=model."); return AOM_CODEC_INVALID_PARAM; - // } - // if( extra_cfg->enable_superres) - // { - // printf("Only --superres-mode=0 can currently be used with - // --timing-info=model."); return AOM_CODEC_INVALID_PARAM; - // } dec_model_cfg->num_units_in_decoding_tick = cfg->g_timebase.num; dec_model_cfg->timing_info.equal_picture_interval = 0; dec_model_cfg->decoder_model_info_present_flag = 1; @@ -1494,8 +1484,6 @@ oxcf->sb_qp_sweep = extra_cfg->sb_qp_sweep; oxcf->global_motion_method = extra_cfg->global_motion_method; - - return AOM_CODEC_OK; } AV1EncoderConfig av1_get_encoder_config(const aom_codec_enc_cfg_t *cfg) {