From 8a066697023e3eab3fc6c2bccc5bd0adb07f4579 Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Wed, 14 Sep 2016 19:56:07 -0700 Subject: avcodec/cuvid: Fully re-initialize the parser after a flush. 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 Signed-off-by: Timo Rothenpieler --- libavcodec/cuvid.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libavcodec/cuvid.c') diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index 19a7772258..131000591e 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; -- cgit v1.2.3