* Public libavcodec VDA header.
*/
+#include "libavcodec/avcodec.h"
#include "libavcodec/version.h"
-#if FF_API_VDA_ASYNC
-#include <pthread.h>
-#endif
-
#include <stdint.h>
// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
* @{
*/
-#if FF_API_VDA_ASYNC
-/**
- * This structure is used to store decoded frame information and data.
- *
- * @deprecated Use synchronous decoding mode.
- */
-typedef struct vda_frame {
- /**
- * The PTS of the frame.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- int64_t pts;
-
- /**
- * The CoreVideo buffer that contains the decoded data.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- CVPixelBufferRef cv_buffer;
-
- /**
- * A pointer to the next frame.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- struct vda_frame *next_frame;
-} vda_frame;
-#endif
-
/**
* This structure is used to provide the necessary configurations and data
* to the VDA Libav HWAccel implementation.
*/
int use_sync_decoding;
-#if FF_API_VDA_ASYNC
- /**
- * VDA frames queue ordered by presentation timestamp.
- *
- * @deprecated Use synchronous decoding mode.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- vda_frame *queue;
-
- /**
- * Mutex for locking queue operations.
- *
- * @deprecated Use synchronous decoding mode.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- pthread_mutex_t queue_mutex;
-#endif
-
/**
* The frame width.
*
OSType cv_pix_fmt_type;
/**
- * The current bitstream buffer.
+ * unused
*/
uint8_t *priv_bitstream;
/**
- * The current size of the bitstream.
+ * unused
*/
int priv_bitstream_size;
/**
- * The reference size used for fast reallocation.
+ * unused
*/
int priv_allocated_size;
};
/** Destroy the video decoder. */
int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
-#if FF_API_VDA_ASYNC
/**
- * Return the top frame of the queue.
+ * This struct holds all the information that needs to be passed
+ * between the caller and libavcodec for initializing VDA decoding.
+ * Its size is not a part of the public ABI, it must be allocated with
+ * av_vda_alloc_context() and freed with av_free().
+ */
+typedef struct AVVDAContext {
+ /**
+ * VDA decoder object. Created and freed by the caller.
+ */
+ VDADecoder decoder;
+
+ /**
+ * The output callback that must be passed to VDADecoderCreate.
+ * Set by av_vda_alloc_context().
+ */
+ VDADecoderOutputCallback output_callback;
+} AVVDAContext;
+
+/**
+ * Allocate and initialize a VDA context.
+ *
+ * This function should be called from the get_format() callback when the caller
+ * selects the AV_PIX_FMT_VDA format. The caller must then create the decoder
+ * object (using the output callback provided by libavcodec) that will be used
+ * for VDA-accelerated decoding.
+ *
+ * When decoding with VDA is finished, the caller must destroy the decoder
+ * object and free the VDA context using av_free().
+ *
+ * @return the newly allocated context or NULL on failure
+ */
+AVVDAContext *av_vda_alloc_context(void);
+
+/**
+ * This is a convenience function that creates and sets up the VDA context using
+ * an internal implementation.
+ *
+ * @param avctx the corresponding codec context
*
- * @deprecated Use synchronous decoding mode.
+ * @return >= 0 on success, a negative AVERROR code on failure
*/
-vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
+int av_vda_default_init(AVCodecContext *avctx);
/**
- * Release the given frame.
+ * This function must be called to free the VDA context initialized with
+ * av_vda_default_init().
*
- * @deprecated Use synchronous decoding mode.
+ * @param avctx the corresponding codec context
*/
-void ff_vda_release_vda_frame(vda_frame *frame);
-#endif
+void av_vda_default_free(AVCodecContext *avctx);
/**
* @}