Merge "Modification and issue fix in full-pixel refining search"

[profile/ivi/libvpx.git] / vpx / vp8dx.h

diff --git a/vpx/vp8dx.h b/vpx/vp8dx.h
index a2a0dd1..4a3aef7 100644 (file)
--- a/vpx/vp8dx.h
+++ b/vpx/vp8dx.h
@@ -24,13 +24,15 @@
 #define VP8DX_H
 #include "vpx/vpx_codec_impl_top.h"
 
-/*!\brief Algorithm interface for VP8
+/*!\name Algorithm interface for VP8
  *
  * This interface provides the capability to decode raw VP8 streams, as would
  * be found in AVI files and other non-Flash uses.
+ * @{
  */
 extern vpx_codec_iface_t  vpx_codec_vp8_dx_algo;
 extern vpx_codec_iface_t* vpx_codec_vp8_dx(void);
+/*!@} - end algorithm interface member group*/
 
 /* Include controls common to both the encoder and decoder */
 #include "vp8.h"
@@ -38,21 +40,28 @@ extern vpx_codec_iface_t* vpx_codec_vp8_dx(void);
 
 /*!\brief VP8 decoder control functions
  *
- * The set of macros define the control functions of VP8 decoder interface
+ * This set of macros define the control functions available for the VP8
+ * decoder interface.
+ *
+ * \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
  *
  */