diff mbox

[FFmpeg-devel,1/2] cuvid: Fully re-initialize the parser after a flush.

Message ID 1473908168-31888-2-git-send-email-philipl@overt.org
State Accepted
Headers show

Commit Message

Philip Langdale Sept. 15, 2016, 2:56 a.m. UTC 
I'm not really sure how this worked at all before, but we do need to
reinitalize the parser with the stream extradata.

Signed-off-by: Philip Langdale <philipl@overt.org>
---
 libavcodec/cuvid.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c
index 19a7772..880a572 100644
--- a/libavcodec/cuvid.c
+++ b/libavcodec/cuvid.c
@@ -706,6 +706,7 @@  static void cuvid_flush(AVCodecContext *avctx)
     AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)ctx->hwdevice->data;
     AVCUDADeviceContext *device_hwctx = device_ctx->hwctx;
     CUcontext dummy, cuda_ctx = device_hwctx->cuda_ctx;
+    CUVIDSOURCEDATAPACKET seq_pkt = { 0, };
     int ret;
 
     ctx->ever_flushed = 1;
@@ -736,6 +737,15 @@  static void cuvid_flush(AVCodecContext *avctx)
     if (ret < 0)
         goto error;
 
+    seq_pkt.payload = ctx->cuparse_ext.raw_seqhdr_data;
+    seq_pkt.payload_size = ctx->cuparse_ext.format.seqhdr_data_length;
+
+    if (seq_pkt.payload && seq_pkt.payload_size) {
+        ret = CHECK_CU(cuvidParseVideoData(ctx->cuparser, &seq_pkt));
+        if (ret < 0)
+            goto error;
+    }
+
     ret = CHECK_CU(cuCtxPopCurrent(&dummy));
     if (ret < 0)
         goto error;