Merge commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e'

[ffmpeg] / libavcodec / qsvdec.h

diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h
index 373cc72b2a7fea895e67946b77f19fb03235446a..c30627a4bd24d26b9ec762cfdf619dff512454db 100644 (file)
--- a/libavcodec/qsvdec.h
+++ b/libavcodec/qsvdec.h
@@ -28,6 +28,7 @@
 
 #include <mfx/mfxvideo.h>
 
+#include "libavutil/fifo.h"
 #include "libavutil/frame.h"
 #include "libavutil/pixfmt.h"
 
@@ -40,24 +41,33 @@ typedef struct QSVContext {
 
     // the session we allocated internally, in case the caller did not provide
     // one
-    mfxSession internal_session;
+    QSVSession internal_qs;
 
     /**
      * a linked list of frames currently being used by QSV
      */
     QSVFrame *work_frames;
 
+    AVFifoBuffer *async_fifo;
+    AVFifoBuffer *input_fifo;
+
+    // this flag indicates that header parsed,
+    // decoder instance created and ready to general decoding
+    int engine_ready;
+
     // options set by the caller
     int async_depth;
     int iopattern;
 
+    char *load_plugins;
+
     mfxExtBuffer **ext_buffers;
     int         nb_ext_buffers;
 } QSVContext;
 
 int ff_qsv_map_pixfmt(enum AVPixelFormat format);
 
-int ff_qsv_decode_init(AVCodecContext *s, QSVContext *q, mfxSession session);
+int ff_qsv_decode_init(AVCodecContext *s, QSVContext *q, AVPacket *avpkt);
 
 int ff_qsv_decode(AVCodecContext *s, QSVContext *q,
                   AVFrame *frame, int *got_frame,