qsv: Merge libav implementation

Merged as-at libav 398f015, and therefore includes outstanding
skipped merges 04b17ff and 130e1f1.

All features not in libav are preserved, and no options change.

1 files changed, 10 insertions, 20 deletions

diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h
index 97a3315b75..0bf1e55ffa 100644
--- a/libavcodec/qsvdec.h
+++ b/libavcodec/qsvdec.h
@@ -41,7 +41,9 @@ typedef struct QSVContext {
 
     // the session we allocated internally, in case the caller did not provide
     // one
-    QSVSession internal_qs;
+    mfxSession internal_session;
+
+    QSVFramesContext frames_ctx;
 
     /**
      * a linked list of frames currently being used by QSV
@@ -49,22 +51,11 @@ typedef struct QSVContext {
     QSVFrame *work_frames;
 
     AVFifoBuffer *async_fifo;
-    AVFifoBuffer *input_fifo;
-
-    // we should to buffer input packets at some cases
-    // else it is not possible to handle dynamic stream changes correctly
-    // this fifo uses for input packets buffering
-    AVFifoBuffer *pkt_fifo;
-
-    // this flag indicates that header parsed,
-    // decoder instance created and ready to general decoding
-    int engine_ready;
 
-    // we can not just re-init decoder if different sequence header arrived
-    // we should to deliver all buffered frames but we can not decode new packets
-    // this time. So when reinit_pending is non-zero we flushing decoder and
-    // accumulate new arrived packets into pkt_fifo
-    int reinit_pending;
+    // the internal parser and codec context for parsing the data
+    AVCodecParserContext *parser;
+    AVCodecContext *avctx_internal;
+    enum AVPixelFormat orig_pix_fmt;
 
     // options set by the caller
     int async_depth;
@@ -78,11 +69,10 @@ typedef struct QSVContext {
 
 int ff_qsv_map_pixfmt(enum AVPixelFormat format);
 
-int ff_qsv_decode(AVCodecContext *s, QSVContext *q,
-                  AVFrame *frame, int *got_frame,
-                  AVPacket *avpkt);
+int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
+                        AVFrame *frame, int *got_frame, AVPacket *pkt);
 
-void ff_qsv_decode_reset(AVCodecContext *avctx, QSVContext *q);
+void ff_qsv_decode_flush(AVCodecContext *avctx, QSVContext *q);
 
 int ff_qsv_decode_close(QSVContext *q);