Let the key & value API support all entries in av1_args.
Now the key & value API supports all paramters listed in under
"AV1 Specific Options" in the aomenc help page.
Also moved several options out of this group since they seem to
belong to other groups better.
A bug related to the av1_args array and the corresponding control
array is also fixed. (see AV1E_SET_CHROMA_SUBSAMPLING_X and
AV1E_SET_CHROMA_SUBSAMPLING_Y in av1_arg_ctrl_map)
Also removed an entry in the key & value api that pointed to the
wrong parameter.
BUG=aomedia:2875
Change-Id: I21aa41c8ea9ebc952b33ef53ebb357db88b01009
(cherry picked from commit 368b918d617c6ef9a4d7df967ef331aaa619fa04)
diff --git a/apps/aomenc.c b/apps/aomenc.c
index 4908058..822df7f 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -220,6 +220,8 @@
AV1E_SET_TIER_MASK,
AV1E_SET_MIN_CR,
AV1E_SET_VBR_CORPUS_COMPLEXITY_LAP,
+ AV1E_SET_CHROMA_SUBSAMPLING_X,
+ AV1E_SET_CHROMA_SUBSAMPLING_Y,
#if CONFIG_TUNE_VMAF
AV1E_SET_VMAF_MODEL_PATH,
#endif
@@ -269,11 +271,13 @@
&g_av1_codec_arg_defs.framerate,
&g_av1_codec_arg_defs.global_error_resilient,
&g_av1_codec_arg_defs.bitdeptharg,
+ &g_av1_codec_arg_defs.inbitdeptharg,
&g_av1_codec_arg_defs.lag_in_frames,
&g_av1_codec_arg_defs.large_scale_tile,
&g_av1_codec_arg_defs.monochrome,
&g_av1_codec_arg_defs.full_still_picture_hdr,
&g_av1_codec_arg_defs.use_16bit_internal,
+ &g_av1_codec_arg_defs.save_as_annexb,
NULL
};
@@ -303,7 +307,10 @@
const arg_def_t *kf_args[] = { &g_av1_codec_arg_defs.fwd_kf_enabled,
&g_av1_codec_arg_defs.kf_min_dist,
&g_av1_codec_arg_defs.kf_max_dist,
- &g_av1_codec_arg_defs.kf_disabled, NULL };
+ &g_av1_codec_arg_defs.kf_disabled,
+ &g_av1_codec_arg_defs.sframe_dist,
+ &g_av1_codec_arg_defs.sframe_mode,
+ NULL };
const arg_def_t *av1_args[] = {
&g_av1_codec_arg_defs.cpu_used_av1,
@@ -403,13 +410,8 @@
&g_av1_codec_arg_defs.set_tier_mask,
&g_av1_codec_arg_defs.set_min_cr,
&g_av1_codec_arg_defs.vbr_corpus_complexity_lap,
- &g_av1_codec_arg_defs.bitdeptharg,
- &g_av1_codec_arg_defs.inbitdeptharg,
&g_av1_codec_arg_defs.input_chroma_subsampling_x,
&g_av1_codec_arg_defs.input_chroma_subsampling_y,
- &g_av1_codec_arg_defs.sframe_dist,
- &g_av1_codec_arg_defs.sframe_mode,
- &g_av1_codec_arg_defs.save_as_annexb,
#if CONFIG_TUNE_VMAF
&g_av1_codec_arg_defs.vmaf_model_path,
#endif
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 5b03354..ad7de20 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -3063,9 +3063,6 @@
} else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.enable_cfl_intra,
argv, err_string)) {
extra_cfg.enable_cfl_intra = arg_parse_int_helper(&arg, err_string);
- } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.superres_mode, argv,
- err_string)) {
- extra_cfg.enable_superres = arg_parse_int_helper(&arg, err_string);
} else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.enable_overlay, argv,
err_string)) {
extra_cfg.enable_overlay = arg_parse_int_helper(&arg, err_string);
@@ -3115,6 +3112,34 @@
} else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.mv_cost_upd_freq,
argv, err_string)) {
extra_cfg.mv_cost_upd_freq = arg_parse_uint_helper(&arg, err_string);
+ }
+#if CONFIG_DENOISE
+ else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.denoise_noise_level,
+ argv, err_string)) {
+ extra_cfg.noise_level =
+ (float)arg_parse_int_helper(&arg, err_string) / 10.0f;
+ } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.denoise_block_size,
+ argv, err_string)) {
+ extra_cfg.noise_block_size = arg_parse_uint_helper(&arg, err_string);
+ }
+#endif
+ else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.target_seq_level_idx,
+ argv, err_string)) {
+ const int val = arg_parse_int_helper(&arg, err_string);
+ const int level = val % 100;
+ const int operating_point_idx = val / 100;
+ if (operating_point_idx >= 0 &&
+ operating_point_idx < MAX_NUM_OPERATING_POINTS) {
+ extra_cfg.target_seq_level_idx[operating_point_idx] = (AV1_LEVEL)level;
+ }
+ } else if (arg_match_helper(&arg,
+ &g_av1_codec_arg_defs.input_chroma_subsampling_x,
+ argv, err_string)) {
+ extra_cfg.chroma_subsampling_x = arg_parse_uint_helper(&arg, err_string);
+ } else if (arg_match_helper(&arg,
+ &g_av1_codec_arg_defs.input_chroma_subsampling_y,
+ argv, err_string)) {
+ extra_cfg.chroma_subsampling_y = arg_parse_uint_helper(&arg, err_string);
} else {
match = 0;
snprintf(err_string, ARG_ERR_MSG_MAX_LEN, "Cannot find aom option %s",
