highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/cuviddec: backport extradata fixes

Browse Source
This commit is contained in:
Timo Rothenpieler
2020-10-01 20:20:48 +02:00
parent 7f0db52c53
commit d44da66fac
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/cuviddec.c
View File

@@ -819,7 +819,7 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
CUcontext dummy; CUcontext dummy;
const AVBitStreamFilter *bsf; const AVBitStreamFilter *bsf;
uint8_t *extradata; uint8_t *extradata;
uint32_t extradata_size; int extradata_size;
int ret = 0; int ret = 0;
enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_CUDA, enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_CUDA,
@@ -989,20 +989,21 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
extradata = ctx->bsf->par_out->extradata; extradata = ctx->bsf->par_out->extradata;
extradata_size = ctx->bsf->par_out->extradata_size; extradata_size = ctx->bsf->par_out->extradata_size;
} else if (avctx->extradata_size > 0) { } else {
extradata = avctx->extradata; extradata = avctx->extradata;
extradata_size = avctx->extradata_size; extradata_size = avctx->extradata_size;
} }
ctx->cuparse_ext = av_mallocz(sizeof(*ctx->cuparse_ext) ctx->cuparse_ext = av_mallocz(sizeof(*ctx->cuparse_ext)
+ FFMAX(extradata_size - sizeof(ctx->cuparse_ext->raw_seqhdr_data), 0)); + FFMAX(extradata_size - (int)sizeof(ctx->cuparse_ext->raw_seqhdr_data), 0));
if (!ctx->cuparse_ext) { if (!ctx->cuparse_ext) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto error; goto error;
} }
ctx->cuparse_ext->format.seqhdr_data_length = avctx->extradata_size; if (extradata_size > 0)
memcpy(ctx->cuparse_ext->raw_seqhdr_data, extradata, extradata_size); memcpy(ctx->cuparse_ext->raw_seqhdr_data, extradata, extradata_size);
ctx->cuparse_ext->format.seqhdr_data_length = extradata_size;
ctx->cuparseinfo.pExtVideoInfo = ctx->cuparse_ext; ctx->cuparseinfo.pExtVideoInfo = ctx->cuparse_ext;