rename AOME_SET_VALIDATE_INPUT_HBD -> VALIDATE_HBD_INPUT This matches the `--validate-hbd-input` option added in: b3272c48a7 aomenc: add --validate-hbd-input option And is a bit more grammatically correct. Change-Id: I67ba5d288b2e6ea668bfdb089a7a6af8cb55790f
diff --git a/aom/aomcx.h b/aom/aomcx.h index 5d6d20f..a409949 100644 --- a/aom/aomcx.h +++ b/aom/aomcx.h
@@ -1641,7 +1641,7 @@ * ensure that every pixel is within the valid range. To disable/enable, * set this parameter to 0/1. The default value is set to be 1. */ - AOME_SET_VALIDATE_INPUT_HBD, + AOME_SET_VALIDATE_HBD_INPUT, // Any new encoder control IDs should be added above. // Maximum allowed encoder control ID is 229. @@ -2351,8 +2351,8 @@ AOM_CTRL_USE_TYPE(AOME_GET_LOOPFILTER_LEVEL, int *) #define AOM_CTRL_AOME_GET_LOOPFILTER_LEVEL -AOM_CTRL_USE_TYPE(AOME_SET_VALIDATE_INPUT_HBD, int) -#define AOM_CTRL_AOME_SET_VALIDATE_INPUT_HBD +AOM_CTRL_USE_TYPE(AOME_SET_VALIDATE_HBD_INPUT, int) +#define AOM_CTRL_AOME_SET_VALIDATE_HBD_INPUT AOM_CTRL_USE_TYPE(AV1E_SET_AUTO_INTRA_TOOLS_OFF, unsigned int) #define AOM_CTRL_AV1E_SET_AUTO_INTRA_TOOLS_OFF
diff --git a/apps/aomenc.c b/apps/aomenc.c index 4930495..f29d5b1 100644 --- a/apps/aomenc.c +++ b/apps/aomenc.c
@@ -471,7 +471,7 @@ &g_av1_codec_arg_defs.screen_detection_mode, &g_av1_codec_arg_defs.sharpness, &g_av1_codec_arg_defs.enable_adaptive_sharpness, - &g_av1_codec_arg_defs.validate_input_hbd, + &g_av1_codec_arg_defs.validate_hbd_input, NULL, };
diff --git a/av1/arg_defs.c b/av1/arg_defs.c index d775ef9..b4025ee 100644 --- a/av1/arg_defs.c +++ b/av1/arg_defs.c
@@ -721,7 +721,7 @@ "Screen content detection mode (1: standard (default in good quality and " "realtime modes), 2: anti-aliased text and graphics aware (default in " "all intra mode))"), - .validate_input_hbd = + .validate_hbd_input = ARG_DEF(NULL, "validate-hbd-input", 1, "Check that input samples are within the valid range " "for the chosen bit depth with high bit depth encoding (0: "
diff --git a/av1/arg_defs.h b/av1/arg_defs.h index 16c5537..a9d68bc 100644 --- a/av1/arg_defs.h +++ b/av1/arg_defs.h
@@ -239,7 +239,7 @@ arg_def_t sb_qp_sweep; arg_def_t enable_low_complexity_decode; arg_def_t screen_detection_mode; - arg_def_t validate_input_hbd; + arg_def_t validate_hbd_input; #endif // CONFIG_AV1_ENCODER } av1_codec_arg_definitions_t;
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index fe0fe21..b474517 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -246,7 +246,7 @@ int kf_max_pyr_height; int sb_qp_sweep; aom_screen_detection_mode screen_detection_mode; - unsigned int validate_input_hbd; + unsigned int validate_hbd_input; }; #if !CONFIG_REALTIME_ONLY @@ -403,7 +403,7 @@ -1, // kf_max_pyr_height 0, // sb_qp_sweep AOM_SCREEN_DETECTION_STANDARD, - 1, // validate_input_hbd + 1, // validate_hbd_input }; #else // Some settings are changed for realtime only build. @@ -560,7 +560,7 @@ -1, // kf_max_pyr_height 0, // sb_qp_sweep AOM_SCREEN_DETECTION_STANDARD, - 1, // validate_input_hbd + 1, // validate_hbd_input }; #endif @@ -1021,7 +1021,7 @@ #endif #if CONFIG_AV1_HIGHBITDEPTH - if (ctx->extra_cfg.validate_input_hbd && + if (ctx->extra_cfg.validate_hbd_input && (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH)) { const unsigned int bit_depth = ctx->oxcf.input_cfg.input_bit_depth; const int max_val = 1 << bit_depth; @@ -1915,10 +1915,10 @@ return update_extra_cfg(ctx, &extra_cfg); } -static aom_codec_err_t ctrl_set_validate_input_hbd(aom_codec_alg_priv_t *ctx, +static aom_codec_err_t ctrl_set_validate_hbd_input(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; - extra_cfg.validate_input_hbd = CAST(AOME_SET_VALIDATE_INPUT_HBD, args); + extra_cfg.validate_hbd_input = CAST(AOME_SET_VALIDATE_HBD_INPUT, args); return update_extra_cfg(ctx, &extra_cfg); } @@ -4847,9 +4847,9 @@ } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.screen_detection_mode, argv, err_string)) { extra_cfg.screen_detection_mode = arg_parse_int_helper(&arg, err_string); - } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.validate_input_hbd, + } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.validate_hbd_input, argv, err_string)) { - extra_cfg.validate_input_hbd = arg_parse_int_helper(&arg, err_string); + extra_cfg.validate_hbd_input = arg_parse_int_helper(&arg, err_string); } else { match = 0; snprintf(err_string, ARG_ERR_MSG_MAX_LEN, "Cannot find aom option %s", @@ -5074,7 +5074,7 @@ ctrl_set_screen_content_detection_mode }, { AV1E_SET_ENABLE_ADAPTIVE_SHARPNESS, ctrl_set_enable_adaptive_sharpness }, { AV1E_SET_EXTERNAL_RATE_CONTROL, ctrl_set_external_rate_control }, - { AOME_SET_VALIDATE_INPUT_HBD, ctrl_set_validate_input_hbd }, + { AOME_SET_VALIDATE_HBD_INPUT, ctrl_set_validate_hbd_input }, // Getters { AOME_GET_LAST_QUANTIZER, ctrl_get_quantizer },
diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc index 6e67964..ba482bc 100644 --- a/test/encode_api_test.cc +++ b/test/encode_api_test.cc
@@ -395,7 +395,7 @@ img->planes[AOM_PLANE_U] = img->planes[AOM_PLANE_V] = nullptr; } - EXPECT_EQ(aom_codec_control(&enc, AOME_SET_VALIDATE_INPUT_HBD, + EXPECT_EQ(aom_codec_control(&enc, AOME_SET_VALIDATE_HBD_INPUT, check_input_range), AOM_CODEC_OK);