virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/nvdec: pass CUstream in vpp parameters

Browse Source
This commit is contained in:
Timo Rothenpieler 2018-05-08 00:07:31 +02:00
parent c855683427
commit 880236e898
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/nvdec.c
View File

@ -39,6 +39,7 @@ typedef struct NVDECDecoder {
AVBufferRef *hw_device_ref; AVBufferRef *hw_device_ref;
CUcontext cuda_ctx; CUcontext cuda_ctx;
CUstream stream;
CudaFunctions *cudl; CudaFunctions *cudl;
CuvidFunctions *cvdl; CuvidFunctions *cvdl;
@ -189,6 +190,7 @@ static int nvdec_decoder_create(AVBufferRef **out, AVBufferRef *hw_device_ref,
} }
decoder->cuda_ctx = device_hwctx->cuda_ctx; decoder->cuda_ctx = device_hwctx->cuda_ctx;
decoder->cudl = device_hwctx->internal->cuda_dl; decoder->cudl = device_hwctx->internal->cuda_dl;
decoder->stream = device_hwctx->stream;
ret = cuvid_load_functions(&decoder->cvdl, logctx); ret = cuvid_load_functions(&decoder->cvdl, logctx);
if (ret < 0) { if (ret < 0) {
@ -386,7 +388,7 @@ static int nvdec_retrieve_data(void *logctx, AVFrame *frame)
NVDECFrame *cf = (NVDECFrame*)fdd->hwaccel_priv; NVDECFrame *cf = (NVDECFrame*)fdd->hwaccel_priv;
NVDECDecoder *decoder = (NVDECDecoder*)cf->decoder_ref->data; NVDECDecoder *decoder = (NVDECDecoder*)cf->decoder_ref->data;
CUVIDPROCPARAMS vpp = { .progressive_frame = 1 }; CUVIDPROCPARAMS vpp = { 0 };
NVDECFrame *unmap_data = NULL; NVDECFrame *unmap_data = NULL;
CUresult err; CUresult err;
@ -397,6 +399,9 @@ static int nvdec_retrieve_data(void *logctx, AVFrame *frame)
unsigned int offset = 0; unsigned int offset = 0;
int ret = 0; int ret = 0;
vpp.progressive_frame = 1;
vpp.output_stream = decoder->stream;
err = decoder->cudl->cuCtxPushCurrent(decoder->cuda_ctx); err = decoder->cudl->cuCtxPushCurrent(decoder->cuda_ctx);
if (err != CUDA_SUCCESS) if (err != CUDA_SUCCESS)
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;