[libav-devel] [PATCH 03/13] qsv: Fix behavior video stream is decoded only half duration

[Yukinori Yamazoe]

---
 libavcodec/qsv.c | 38 ++++++++++++++++++++++----------------
 libavcodec/qsv.h |  2 +-
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 8ffe5d4..aaa3291 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -165,6 +165,7 @@ int ff_qsv_init(AVCodecContext *c, QSVContext *q)
         return ff_qsv_error(ret);
 
     q->nb_surfaces = req.NumFrameSuggested + q->param.AsyncDepth;
+    q->last_ret    = MFX_ERR_MORE_DATA;
 
     return qsv_surface_alloc(q, &req);
 }
@@ -281,35 +282,40 @@ int ff_qsv_decode(AVCodecContext *avctx, QSVContext *q,
 
     ff_packet_list_put(&q->pending, &q->pending_end, avpkt);
 
-    if (!q->wait) {
-        AVPacket pkt = { 0 };
+    ret = q->last_ret;
+    do {
+        if (ret == MFX_ERR_MORE_DATA) {
+            if (q->pending) {
+                AVPacket pkt = { 0 };
 
-        ff_packet_list_get(&q->pending, &q->pending_end, &pkt);
+                ff_packet_list_get(&q->pending, &q->pending_end, &pkt);
 
-        if (!(ret = put_dts(q, pkt.pts, pkt.dts))) {
-            q->bs.TimeStamp = pkt.pts;
+                if (!(ret = put_dts(q, pkt.pts, pkt.dts))) {
+                    q->bs.TimeStamp = pkt.pts;
 
-            ret = bitstream_enqueue(&q->bs, pkt.data, pkt.size);
-        }
+                    ret = bitstream_enqueue(&q->bs, pkt.data, pkt.size);
+                }
 
-        av_packet_unref(&pkt);
+                av_packet_unref(&pkt);
 
-        if (ret < 0)
-            return ret;
-    }
+                if (ret < 0)
+                    return ret;
+            } else {
+                break;
+            }
+        }
 
-    ret = MFX_ERR_MORE_SURFACE;
+        if (!(insurf = get_surface(q)))
+            break;
 
-    while ((insurf = get_surface(q)) && ret == MFX_ERR_MORE_SURFACE) {
         ret = MFXVideoDECODE_DecodeFrameAsync(q->session, &q->bs,
                                               insurf, &outsurf, &sync);
-    }
+    } while (ret == MFX_ERR_MORE_SURFACE || ret == MFX_ERR_MORE_DATA);
 
-    q->wait = 1;
+    q->last_ret = ret;
 
     switch (ret) {
     case MFX_ERR_MORE_DATA:
-        q->wait = 0;
         ret = 0;
         break;
     case MFX_WRN_VIDEO_PARAM_CHANGED:
diff --git a/libavcodec/qsv.h b/libavcodec/qsv.h
index d558fbb..6629c5f 100644
--- a/libavcodec/qsv.h
+++ b/libavcodec/qsv.h
@@ -46,7 +46,7 @@ typedef struct QSVContext {
     int nb_surfaces;
     mfxSyncPoint sync;
     mfxBitstream bs;
-    int wait;
+    int last_ret;
     AVPacketList *pending, *pending_end;
 } QSVContext;
 
-- 
1.8.3.msysgit.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel