Ticket #11426: qsv_decode_flush_fix.diff

libavcodec/qsvdec.c

@@ -104 +104 @@
     int suggest_pool_size;
     int initialized;
 
+    int flush;
+
     // options set by the caller
     int async_depth;
     int iopattern;
@@ -412 +414 @@
 
     q->frame_info = param->mfx.FrameInfo;
 
+    q->flush = 0;
+
     if (!avctx->hw_frames_ctx) {
         ret = av_image_get_buffer_size(avctx->pix_fmt, FFALIGN(avctx->coded_width, 128), FFALIGN(avctx->coded_height, 64), 1);
         if (ret < 0)
@@ -1057 +1061 @@
         q->initialized = 1;
     }
 
+    if (q->flush) {
+        q->reinit_flag = 0;
+        ret = qsv_decode_header(avctx, q, pkt, pix_fmt, &param);
+        if (ret < 0) {
+            if (ret == AVERROR(EAGAIN))
+                av_log(avctx, AV_LOG_VERBOSE, "More data is required to decode header\n");
+            else
+                av_log(avctx, AV_LOG_ERROR, "Error decoding header\n");
+            goto reinit_fail;
+        }
+
+        q->orig_pix_fmt = avctx->pix_fmt = ff_qsv_map_fourcc(param.mfx.FrameInfo.FourCC);
+        q->flush = 0;
+    }
+
     return qsv_decode(avctx, q, frame, got_frame, pkt);
 
 reinit_fail:
@@ -1209 +1228 @@
 
     qsv_clear_buffers(s);
 
+    if (s->qsv.session) {
+        mfxVideoParam param = { 0 };
+
+        int ret = MFXVideoDECODE_GetVideoParam(s->qsv.session, &param);
+        if (ret < 0) {
+            ff_qsv_print_error(avctx, ret, "MFX decode get param error");
+            return;
+        }
+
+        ret = MFXVideoDECODE_Reset(s->qsv.session, &param);
+        if (ret < 0) {
+            ff_qsv_print_error(avctx, ret, "MFX decode reset error");
+            return;
+        }
+    }
+
     s->qsv.orig_pix_fmt = AV_PIX_FMT_NONE;
-    s->qsv.initialized = 0;
+    s->qsv.flush = 1;
 }
 
 #define OFFSET(x) offsetof(QSVDecContext, x)