From 4a742e5c7987e2a57d5b8432f3be310a5a4eafb4 Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Fri, 4 Mar 2011 08:51:39 -0500
Subject: [PATCH] cosmetic: clean up comments for new vp8dx controls
Rename the common control id enum vp8_{dec,com}_control_id,
move VP8_DECODER_CTRL_ID_START to common, wrap long lines.
Change-Id: I659abc62f10aa389d496f7f43950775db0ef2f9f
---
vpx/vp8.h | 5 +++--
vpx/vp8dx.h | 18 +++++++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/vpx/vp8.h b/vpx/vp8.h
index 430f909116..7ca5c6e074 100644
--- a/vpx/vp8.h
+++ b/vpx/vp8.h
@@ -36,7 +36,7 @@
*
* The set of macros define the control functions of VP8 interface
*/
-enum vp8_dec_control_id
+enum vp8_com_control_id
{
VP8_SET_REFERENCE = 1, /**< pass in an external frame into decoder to be used as reference frame */
VP8_COPY_REFERENCE = 2, /**< get a copy of reference frame from the decoder */
@@ -45,7 +45,8 @@ enum vp8_dec_control_id
VP8_SET_DBG_COLOR_MB_MODES = 5, /**< set which macro block modes to color */
VP8_SET_DBG_COLOR_B_MODES = 6, /**< set which blocks modes to color */
VP8_SET_DBG_DISPLAY_MV = 7, /**< set which motion vector modes to draw */
- VP8_COMMON_CTRL_ID_MAX
+ VP8_COMMON_CTRL_ID_MAX,
+ VP8_DECODER_CTRL_ID_START = 256,
};
/*!\brief post process flags
diff --git a/vpx/vp8dx.h b/vpx/vp8dx.h
index 1a81a81f4a..4a3aef7609 100644
--- a/vpx/vp8dx.h
+++ b/vpx/vp8dx.h
@@ -45,19 +45,23 @@ extern vpx_codec_iface_t* vpx_codec_vp8_dx(void);
*
* \sa #vpx_codec_control
*/
-enum vp8d_dec_control_id
+enum vp8_dec_control_id
{
- VP8_DECODER_CTRL_ID_START = 256,
- VP8D_GET_LAST_REF_UPDATES, /**< control function to get info on which reference frames were updated
- by the last decode */
- VP8D_GET_FRAME_CORRUPTED, /**< check if the indicated frame is corrupted */
+ /** control function to get info on which reference frames were updated
+ * by the last decode
+ */
+ VP8D_GET_LAST_REF_UPDATES = VP8_DECODER_CTRL_ID_START,
+
+ /** check if the indicated frame is corrupted */
+ VP8D_GET_FRAME_CORRUPTED,
+
VP8_DECODER_CTRL_ID_MAX
} ;
-/*!\brief VP8 encoder control function parameter type
+/*!\brief VP8 decoder control function parameter type
*
- * Defines the data types that VP8E control functions take. Note that
+ * Defines the data types that VP8D control functions take. Note that
* additional common controls are defined in vp8.h
*
*/
--
GitLab