Merge "Add comments for VP9E_SET_FRAME_PERIODIC_BOOST"

diff --combined vpx/vp8cx.h
index 9fae44912ffb91ee79796ead889eeba9221de3ba,32de177e33ea21ca60b0d8cd5e2de82ee12da107..e796580a8fe3ab39981427ba771f43cd9771d968
--- 1/vpx/vp8cx.h
--- 2/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@@ -308,7 -308,20 +308,20 @@@ enum vp8e_enc_control_id 
     * By default, encoder operates with AQ_Mode 0(adaptive quantization off).
     */
    VP9E_SET_AQ_MODE,
+ 
+   /*!\brief Codec control function to enable/disable periodic Q boost
+    *
+    * One VP9 encoder speed feature is to enable quality boost by lowering
+    * frame level Q periodically. This control function provides a mean to
+    * turn on/off this feature.
+    *               0 = off
+    *               1 = on
+    *
+    * By default, the encoder is allowed to use this feature for appropriate
+    * encoding modes.
+    */
    VP9E_SET_FRAME_PERIODIC_BOOST,
+ 
    /*!\brief control function to set noise sensitivity
     *
     *  0: off, 1: OnYOnly
@@@ -327,19 -340,6 +340,19 @@@
    VP9E_SET_TUNE_CONTENT,
    VP9E_GET_SVC_LAYER_ID,
    VP9E_REGISTER_CX_CALLBACK,
 +
 +  /*!\brief control function to set color space info.
 +   * \note Valid ranges: 0..7, default is "UNKNOWN".
 +   *                     0 = UNKNOWN,
 +   *                     1 = BT_601
 +   *                     2 = BT_709
 +   *                     3 = SMPTE_170
 +   *                     4 = SMPTE_240
 +   *                     5 = BT_2020
 +   *                     6 = RESERVED
 +   *                     7 = SRGB
 +   */
 +  VP9E_SET_COLOR_SPACE,
  };
  
  /*!\brief vpx 1-D scaling mode
@@@ -504,8 -504,6 +517,8 @@@ VPX_CTRL_USE_TYPE(VP9E_SET_FRAME_PERIOD
  VPX_CTRL_USE_TYPE(VP9E_SET_NOISE_SENSITIVITY,  unsigned int)
  
  VPX_CTRL_USE_TYPE(VP9E_SET_TUNE_CONTENT, int) /* vp9e_tune_content */
 +
 +VPX_CTRL_USE_TYPE(VP9E_SET_COLOR_SPACE, int)
  /*! @} - end defgroup vp8_encoder */
  #ifdef __cplusplus
  }  // extern "C"