Set vizier rc parameters

If pass --use-vizier-rc-params=1, the rc parameters are overwittern by pass in values. It --use-vizier-rc-params=0, the rc parameters remain the default values.

Cheng Chen committed 5 years ago

Commit 1b07aae1 parent 1c792f26 files · +72 −103Browse files

Unified · Split

6 files

vp8/vp8_cx_iface.c +2 −0
vp9/encoder/vp9_firstpass.c +24 −101
vp9/encoder/vp9_firstpass.h +4 −0
vp9/vp9_cx_iface.c +4 −0
vpx/vpx_encoder.h +30 −0
vpxenc.c +8 −2

vp8/vp8_cx_iface.c+2−0

 #endif
   // The range below shall be further tuned.
+  RANGE_CHECK(cfg, use_vizier_rc_params, 0, 1);
   RANGE_CHECK(cfg, active_wq_factor.den, 1, 1000);
   RANGE_CHECK(cfg, base_err_per_mb.den, 1, 1000);
   RANGE_CHECK(cfg, sr_default_decay_limit.den, 1, 1000);
         { 0 },    /* ts_layer_id */
         { 0 },    /* layer_target_bitrate */
         0,        /* temporal_layering_mode */
+        0,        /* use_vizier_rc_params */
         { 0, 1 }, /* active_wq_factor */
         { 0, 1 }, /* base_err_per_mb */
         { 0, 1 }, /* sr_default_decay_limit */

vp9/encoder/vp9_firstpass.c+24−101

@@ -3493,109 +3493,32 @@ static int is_skippable_frame(const VP9_COMP *cpi) { · 3492 unmodified lines
3493	// Configure image size specific vizier parameters.	3493	// Configure image size specific vizier parameters.
3494	// Later these will be set via additional command line options	3494	// Later these will be set via additional command line options
3495	static void init_vizier_params(TWO_PASS *const twopass, int screen_area) {	3495	static void init_vizier_params(TWO_PASS *const twopass, int screen_area) {
3496	if (1) {	3496	// When \|use_vizier_rc_params\| is 1, we expect the rc parameters have been
3497	// Force defaults for now	3497	// initialized by the pass in values.
3498	twopass->active_wq_factor = AV_WQ_FACTOR;	3498	// Be careful that parameters below are only initialized to 0, if we do not
3499	twopass->base_err_per_mb = BASELINE_ERR_PER_MB;	3499	// pass values to them. It is desired to take care of each parameter when
3500	twopass->sr_default_decay_limit = DEFAULT_DECAY_LIMIT;	3500	// using \|use_vizier_rc_params\|.
3501	twopass->sr_diff_factor = 1.0;	3501	if (twopass->use_vizier_rc_params) return;
3502	twopass->gf_frame_max_boost = GF_MAX_FRAME_BOOST;	3502
3503	twopass->gf_max_total_boost = MAX_GF_BOOST;	3503	// When \|use_vizier_rc_params\| is 0, use defaults for now.
3504	if (screen_area < 1280 * 720) {	3504	twopass->active_wq_factor = AV_WQ_FACTOR;
3505	twopass->kf_err_per_mb = 2000.0;	3505	twopass->base_err_per_mb = BASELINE_ERR_PER_MB;
3506	} else if (screen_area < 1920 * 1080) {	3506	twopass->sr_default_decay_limit = DEFAULT_DECAY_LIMIT;
3507	twopass->kf_err_per_mb = 500.0;	3507	twopass->sr_diff_factor = 1.0;
3508	} else {	3508	twopass->gf_frame_max_boost = GF_MAX_FRAME_BOOST;
3509	twopass->kf_err_per_mb = 250.0;	3509	twopass->gf_max_total_boost = MAX_GF_BOOST;
3510	}	3510	if (screen_area < 1280 * 720) {
3511	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;	3511	twopass->kf_err_per_mb = 2000.0;
3512	twopass->kf_frame_max_boost_first = KF_MAX_FRAME_BOOST;	3512	} else if (screen_area < 1920 * 1080) {
3513	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;	3513	twopass->kf_err_per_mb = 500.0;
3514	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
3515	twopass->zm_factor = 1.0;
3516	} else {	3514	} else {
3517	// Vizer experimental parameters from training.	3515	twopass->kf_err_per_mb = 250.0;
3518	// Later these will be set via the command line.
3519	if (screen_area <= 176 * 144) {
3520	twopass->active_wq_factor = 46.0;
3521	twopass->base_err_per_mb = 37597.399760969536;
3522	twopass->sr_default_decay_limit = 0.3905639800962774;
3523	twopass->sr_diff_factor = 6.4;
3524	twopass->gf_frame_max_boost = 87.27362648627846;
3525	twopass->gf_max_total_boost = MAX_GF_BOOST;
3526	twopass->kf_err_per_mb = 1854.8255436877148;
3527	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;
3528	twopass->kf_frame_max_boost_first = 25.5;
3529	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;
3530	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
3531	twopass->zm_factor = 1.0;
3532	} else if (screen_area <= 320 * 240) {
3533	twopass->active_wq_factor = 55.0;
3534	twopass->base_err_per_mb = 34525.33177195309;
3535	twopass->sr_default_decay_limit = 0.23901360046804604;
3536	twopass->sr_diff_factor = 5.73;
3537	twopass->gf_frame_max_boost = 127.34978204980285;
3538	twopass->gf_max_total_boost = MAX_GF_BOOST;
3539	twopass->kf_err_per_mb = 723.8337508755031;
3540	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;
3541	twopass->kf_frame_max_boost_first = 185.0;
3542	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;
3543	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
3544	twopass->zm_factor = 1.0;
3545	} else if (screen_area <= 640 * 360) {
3546	twopass->active_wq_factor = 12.5;
3547	twopass->base_err_per_mb = 18823.978018028298;
3548	twopass->sr_default_decay_limit = 0.6043527690301296;
3549	twopass->sr_diff_factor = 2.28;
3550	twopass->gf_frame_max_boost = 75.17672317013668;
3551	twopass->gf_max_total_boost = MAX_GF_BOOST;
3552	twopass->kf_err_per_mb = 422.2871502380377;
3553	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;
3554	twopass->kf_frame_max_boost_first = 224.5;
3555	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;
3556	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
3557	twopass->zm_factor = 1.0;
3558	} else if (screen_area <= 854 * 480) {
3559	twopass->active_wq_factor = 51.5;
3560	twopass->base_err_per_mb = 33718.98307662595;
3561	twopass->sr_default_decay_limit = 0.33633414970713393;
3562	twopass->sr_diff_factor = 5.8;
3563	twopass->gf_frame_max_boost = 85.2868528581522;
3564	twopass->gf_max_total_boost = MAX_GF_BOOST;
3565	twopass->kf_err_per_mb = 1513.4883914008383;
3566	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;
3567	twopass->kf_frame_max_boost_first = 28.0;
3568	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;
3569	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
3570	twopass->zm_factor = 1.0;
3571	} else if (screen_area <= 1280 * 720) {
3572	twopass->active_wq_factor = 41.5;
3573	twopass->base_err_per_mb = 29527.46375825401;
3574	twopass->sr_default_decay_limit = 0.5009117586299728;
3575	twopass->sr_diff_factor = 3.33;
3576	twopass->gf_frame_max_boost = 81.00472969483079;
3577	twopass->gf_max_total_boost = MAX_GF_BOOST;
3578	twopass->kf_err_per_mb = 998.6342911785146;
3579	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;
3580	twopass->kf_frame_max_boost_first = 53.0;
3581	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;
3582	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
3583	twopass->zm_factor = 1.0;
3584	} else {
3585	twopass->active_wq_factor = 31.0;
3586	twopass->base_err_per_mb = 34474.723463367416;
3587	twopass->sr_default_decay_limit = 0.23346886902707745;
3588	twopass->sr_diff_factor = 7.6;
3589	twopass->gf_frame_max_boost = 213.2940230360479;
3590	twopass->gf_max_total_boost = MAX_GF_BOOST;
3591	twopass->kf_err_per_mb = 35931.25734431429;
3592	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;
3593	twopass->kf_frame_max_boost_first = 419.5;
3594	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;
3595	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
3596	twopass->zm_factor = 1.0;
3597	}
3598	}	3516	}
		3517	twopass->kf_frame_min_boost = KF_MIN_FRAME_BOOST;
		3518	twopass->kf_frame_max_boost_first = KF_MAX_FRAME_BOOST;
		3519	twopass->kf_frame_max_boost_subs = twopass->kf_frame_max_boost_first;
		3520	twopass->kf_max_total_boost = MAX_KF_TOT_BOOST;
		3521	twopass->zm_factor = 1.0;
3599	}	3522	}
3600		3523
3601	void vp9_rc_get_second_pass_params(VP9_COMP *cpi) {	3524	void vp9_rc_get_second_pass_params(VP9_COMP *cpi) {

vp9/encoder/vp9_firstpass.h+4−0

   GF_GROUP gf_group;
   // Vizeir project experimental two pass rate control parameters.
+  // When |use_vizier_rc_params| is 1, the following parameters will
+  // be overwritten by pass in values. Otherwise, they are initialized
+  // by default values.
+  int use_vizier_rc_params;
   double active_wq_factor;
   double base_err_per_mb;
   double sr_default_decay_limit;

vp9/vp9_cx_iface.c+4−0

   RANGE_CHECK(extra_cfg, color_range, VPX_CR_STUDIO_RANGE, VPX_CR_FULL_RANGE);
   // The range below shall be further tuned.
+  RANGE_CHECK(cfg, use_vizier_rc_params, 0, 1);
   RANGE_CHECK(cfg, active_wq_factor.den, 1, 1000);
   RANGE_CHECK(cfg, base_err_per_mb.den, 1, 1000);
   RANGE_CHECK(cfg, sr_default_decay_limit.den, 1, 1000);
 static vpx_codec_err_t set_twopass_params_from_config(
     const vpx_codec_enc_cfg_t *const cfg, struct VP9_COMP *cpi) {
+  if (!cfg->use_vizier_rc_params) return VPX_CODEC_OK;
   if (cpi == NULL) return VPX_CODEC_ERROR;
+  cpi->twopass.use_vizier_rc_params = cfg->use_vizier_rc_params;
   cpi->twopass.active_wq_factor =
       (double)cfg->active_wq_factor.num / (double)cfg->active_wq_factor.den;
   cpi->twopass.base_err_per_mb =
         { 0 },     // ts_layer_id
         { 0 },     // layer_taget_bitrate
         0,         // temporal_layering_mode
+        0,         // use_vizier_rc_params
         { 0, 1 },  // active_wq_factor
         { 0, 1 },  // base_err_per_mb
         { 0, 1 },  // sr_default_decay_limit

vpx/vpx_encoder.h+30−0

    */
   int temporal_layering_mode;
+  /*!\brief A flag indicating whether to use external rate control parameters.
+   * By default is 0. If set to 1, the following parameters will be used in the
+   * rate control system.
+   */
+  int use_vizier_rc_params;
   /*!\brief Active worst quality factor.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t active_wq_factor;
   /*!\brief Base error per macroblock.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t base_err_per_mb;
   /*!\brief Second reference default decay limit.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t sr_default_decay_limit;
   /*!\brief Second reference difference factor.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t sr_diff_factor;
   /*!\brief Keyframe error per macroblock.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t kf_err_per_mb;
   /*!\brief Keyframe minimum boost.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t kf_frame_min_boost;
   /*!\brief Keyframe maximum boost, for the first keyframe in a chunk.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t kf_frame_max_boost_first;
   /*!\brief Keyframe maximum boost, for subsequent keyframes.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t kf_frame_max_boost_subs;
   /*!\brief Keyframe maximum total boost.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t kf_max_total_boost;
   /*!\brief Golden frame maximum total boost.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t gf_max_total_boost;
   /*!\brief Golden frame maximum boost.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t gf_frame_max_boost;
   /*!\brief Zero motion power factor.
    *
    * Rate control parameters, set from external experiment results.
+   * Only when |use_vizier_rc_params| is set to 1, the pass in value will be
+   * used. Otherwise, the default value is used.
    *
    */
   vpx_rational_t zm_factor;

vpxenc.c+8−2

 };
 #if CONFIG_VP9_ENCODER
+static const arg_def_t use_vizier_rc_params =
+    ARG_DEF(NULL, "use-vizier-rc-params", 1, "Use vizier rc params");
 static const arg_def_t active_wq_factor =
     ARG_DEF(NULL, "active-wq-factor", 1, "Active worst quality factor");
 static const arg_def_t base_err_per_mb =
 static const arg_def_t gf_frame_max_boost =
     ARG_DEF(NULL, "gf-frame-max-boost", 1, "Golden frame max boost");
 static const arg_def_t zm_factor =
-    ARG_DEF(NULL, "zm-power-factor", 1, "Zero motion power factor");
+    ARG_DEF(NULL, "zm-factor", 1, "Zero motion power factor");
-static const arg_def_t *vizier_rc_args[] = { &active_wq_factor,
+static const arg_def_t *vizier_rc_args[] = { &use_vizier_rc_params,
+                                             &active_wq_factor,
                                              &base_err_per_mb,
                                              &sr_default_decay_limit,
                                              &sr_diff_factor,
     } else if (arg_match(&arg, &kf_disabled, argi)) {
       config->cfg.kf_mode = VPX_KF_DISABLED;
 #if CONFIG_VP9_ENCODER
+    } else if (arg_match(&arg, &use_vizier_rc_params, argi)) {
+      config->cfg.use_vizier_rc_params = arg_parse_int(&arg);
     } else if (arg_match(&arg, &active_wq_factor, argi)) {
       config->cfg.active_wq_factor = arg_parse_rational(&arg);
     } else if (arg_match(&arg, &base_err_per_mb, argi)) {
   SHOW(kf_min_dist);
   SHOW(kf_max_dist);
   // Temporary use for debug
+  SHOW(use_vizier_rc_params);
   SHOW(active_wq_factor.num);
   SHOW(active_wq_factor.den);
 }

Set vizier rc parameters

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code