Further normalization of Vizier parameters.

Further changes to normalize the Vizier command line parameters.
The intent is that the default behavior for any given parameter
is signaled by the value 1.0 (expressed on the command line as a
rational).

The final values used in the two pass code are obtained by multiplying
the passed in factors by a default values if use_vizier_rc_params is 1.
Where  use_vizier_rc_params is 0 the values are explicitly set to
the defaults.

This patch also changes the default value of each parameter to 1.0
even if not set explicitly. This should ensure safe /default behavior
if the user sets use_vizier_rc_params to 1 but does not set all the
the individual parameters.

Change-Id: Ied08b3c22df18f42f446a4cc9363473cad097f69

1 files changed, 17 insertions, 16 deletions

diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h
index 255cb693e..d62d9ee7e 100644
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -709,14 +709,14 @@ typedef struct vpx_codec_enc_cfg {
    */
   vpx_rational_t active_wq_factor;
 
-  /*!\brief Base error per macroblock.
+  /*!\brief Error per macroblock adjustment 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 base_err_per_mb;
+  vpx_rational_t err_per_mb_factor;
 
   /*!\brief Second reference default decay limit.
    *
@@ -736,68 +736,69 @@ typedef struct vpx_codec_enc_cfg {
    */
   vpx_rational_t sr_diff_factor;
 
-  /*!\brief Keyframe error per macroblock.
+  /*!\brief Keyframe error per macroblock adjustment 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 kf_err_per_mb;
+  vpx_rational_t kf_err_per_mb_factor;
 
-  /*!\brief Keyframe minimum boost.
+  /*!\brief Keyframe minimum boost adjustment 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 kf_frame_min_boost;
+  vpx_rational_t kf_frame_min_boost_factor;
 
-  /*!\brief Keyframe maximum boost, for the first keyframe in a chunk.
+  /*!\brief Keyframe maximum boost adjustment factor, 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;
+  vpx_rational_t kf_frame_max_boost_first_factor;
 
-  /*!\brief Keyframe maximum boost, for subsequent keyframes.
+  /*!\brief Keyframe maximum boost adjustment factor, 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;
+  vpx_rational_t kf_frame_max_boost_subs_factor;
 
-  /*!\brief Keyframe maximum total boost.
+  /*!\brief Keyframe maximum total boost adjustment 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 kf_max_total_boost;
+  vpx_rational_t kf_max_total_boost_factor;
 
-  /*!\brief Golden frame maximum total boost.
+  /*!\brief Golden frame maximum total boost adjustment 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 gf_max_total_boost;
+  vpx_rational_t gf_max_total_boost_factor;
 
-  /*!\brief Golden frame maximum boost.
+  /*!\brief Golden frame maximum boost adjustment 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 gf_frame_max_boost;
+  vpx_rational_t gf_frame_max_boost_factor;
 
   /*!\brief Zero motion power factor.
    *