Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / vda.h

diff --git a/libavcodec/vda.h b/libavcodec/vda.h
index 3f70cf2cf2606ed4d1b9caed531f9ab27cd6d647..6e9de9cd0a46bf7f8512563d5a8f709ddac29b52 100644 (file)
--- a/libavcodec/vda.h
+++ b/libavcodec/vda.h
@@ -23,6 +23,7 @@
 #ifndef AVCODEC_VDA_H
 #define AVCODEC_VDA_H
 
+#include <pthread.h>
 #include <stdint.h>
 
 // emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
@@ -30,16 +31,13 @@
 #undef __GNUC_STDC_INLINE__
 
 #define Picture QuickdrawPicture
-
-#include <pthread.h>
-#include "avcodec.h"
 #include <VideoDecodeAcceleration/VDADecoder.h>
+#undef Picture
 
 /**
  *  This structure is used to store a decoded frame information and data.
  */
-typedef struct
-{
+typedef struct {
     /**
     * The PTS of the frame.
     *
@@ -63,7 +61,6 @@ typedef struct
     * - decoding: Set/Unset by libavcodec.
     */
     struct vda_frame    *next_frame;
-
 } vda_frame;
 
 /**
@@ -73,7 +70,6 @@ typedef struct
  * The application must make it available as AVCodecContext.hwaccel_context.
  */
 struct vda_context {
-
     /**
     * VDA decoder object.
     *
@@ -96,7 +92,7 @@ struct vda_context {
     * - encoding: unused
     * - decoding: Set/Unset by libavcodec.
     */
-    void                *queue_mutex;
+    pthread_mutex_t     queue_mutex;
 
     /**
     * The frame width.
@@ -121,20 +117,52 @@ struct vda_context {
     * - decoding: Set/Unset by user.
     */
     int                 format;
+
+    /**
+    * The pixel format for output image buffers.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by user.
+    */
+    OSType              cv_pix_fmt_type;
+
+    /**
+    * The current bitstream buffer.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    uint8_t             *bitstream;
+
+    /**
+    * The current size of the bitstream.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    int                 bitstream_size;
+
+    /**
+    * The reference size used for fast reallocation.
+    *
+    * - encoding: unused
+    * - decoding: Set/Unset by libavcodec.
+    */
+    int                 ref_size;
 };
 
-/** Creates the video decoder. */
+/** Create the video decoder. */
 int ff_vda_create_decoder(struct vda_context *vda_ctx,
                           uint8_t *extradata,
                           int extradata_size);
 
-/** Destroys the video decoder. */
+/** Destroy the video decoder. */
 int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
 
-/** Returns the top frame of the queue. */
+/** Return the top frame of the queue. */
 vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
 
-/** Releases the given frame. */
+/** Release the given frame. */
 void ff_vda_release_vda_frame(vda_frame *frame);
 
 #endif /* AVCODEC_VDA_H */