From: Yaowu Xu <yaowu@google.com>
Date: Thu, 15 Jan 2015 01:53:42 +0000 (-0800)
Subject: Merge "Add comments for two SVC related controls"
X-Git-Tag: v1.4.0~252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81194188a1a7b53696d8a3b98b5cfb5d8c573e4f;p=libvpx

Merge "Add comments for two SVC related controls"
---

81194188a1a7b53696d8a3b98b5cfb5d8c573e4f
diff --cc vpx/vp8cx.h
index e00404b66,fbf82c205..a1618adae
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@@ -344,21 -344,18 +344,31 @@@ enum vp8e_enc_control_id 
     *              VP9E_CONTENT_SCREEN  = Screen capture content
     */
    VP9E_SET_TUNE_CONTENT,
+ 
+   /*!\brief control function to get svc layer ID.
+    * \note The layer ID returned is for the data packet from the registered
+    *       callback function.
+    */
    VP9E_GET_SVC_LAYER_ID,
+ 
+   /*!\brief control function to register callback for getting per layer packet.
+    * \note Parameter for this control function is a structure with a callback
+    *       function and a pointer to private data used by the callback.
+    */
    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