RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-27 09:43:34 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/nvdec: make explicit copy of frames unless user requested otherwise

Browse Source
This commit is contained in:
Timo Rothenpieler 2022-12-05 22:34:00 +01:00
parent 7a8d78f7e3
commit 7e8b539389
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/nvdec.c
View File

@ -51,6 +51,8 @@ typedef struct NVDECDecoder {
CudaFunctions *cudl; CudaFunctions *cudl;
CuvidFunctions *cvdl; CuvidFunctions *cvdl;
int unsafe_output;
} NVDECDecoder; } NVDECDecoder;
typedef struct NVDECFramePool { typedef struct NVDECFramePool {
@ -344,6 +346,8 @@ int ff_nvdec_decode_init(AVCodecContext *avctx)
int cuvid_codec_type, cuvid_chroma_format, chroma_444; int cuvid_codec_type, cuvid_chroma_format, chroma_444;
int ret = 0; int ret = 0;
int unsafe_output = !!(avctx->hwaccel_flags & AV_HWACCEL_FLAG_UNSAFE_OUTPUT);
sw_desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt); sw_desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
if (!sw_desc) if (!sw_desc)
return AVERROR_BUG; return AVERROR_BUG;
@ -402,7 +406,7 @@ int ff_nvdec_decode_init(AVCodecContext *avctx)
params.CodecType = cuvid_codec_type; params.CodecType = cuvid_codec_type;
params.ChromaFormat = cuvid_chroma_format; params.ChromaFormat = cuvid_chroma_format;
params.ulNumDecodeSurfaces = frames_ctx->initial_pool_size; params.ulNumDecodeSurfaces = frames_ctx->initial_pool_size;
params.ulNumOutputSurfaces = frames_ctx->initial_pool_size; params.ulNumOutputSurfaces = unsafe_output ? frames_ctx->initial_pool_size : 1;
ret = nvdec_decoder_create(&ctx->decoder_ref, frames_ctx->device_ref, &params, avctx); ret = nvdec_decoder_create(&ctx->decoder_ref, frames_ctx->device_ref, &params, avctx);
if (ret < 0) { if (ret < 0) {
@ -417,6 +421,7 @@ int ff_nvdec_decode_init(AVCodecContext *avctx)
} }
decoder = (NVDECDecoder*)ctx->decoder_ref->data; decoder = (NVDECDecoder*)ctx->decoder_ref->data;
decoder->unsafe_output = unsafe_output;
decoder->real_hw_frames_ref = real_hw_frames_ref; decoder->real_hw_frames_ref = real_hw_frames_ref;
real_hw_frames_ref = NULL; real_hw_frames_ref = NULL;
@ -554,7 +559,11 @@ copy_fail:
finish: finish:
CHECK_CU(decoder->cudl->cuCtxPopCurrent(&dummy)); CHECK_CU(decoder->cudl->cuCtxPopCurrent(&dummy));
return ret;
if (ret < 0 || decoder->unsafe_output)
return ret;
return av_frame_make_writable(frame);
} }
int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame) int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame)