From: Zhao Zhili <zhiliz...@tencent.com>
Regression from 45e3b6a68. cuvidParseVideoData report unknown
error with AV1CodecConfigurationRecord.
---
libavcodec/cuviddec.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
index cb3cda7e24..584fff40ed 100644
--- a/libavcodec/cuviddec.c
+++ b/libavcodec/cuviddec.c
@@ -953,6 +953,17 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
extradata_size = avctx->extradata_size;
}
+#if CONFIG_AV1_CUVID_DECODER && defined(CUVID_HAS_AV1_SUPPORT)
+ if (avctx->codec->id == AV_CODEC_ID_AV1 &&
+ extradata_size > 4 &&
+ extradata && extradata[0] & 0x80) {
+ // skip AV1CodecConfigurationRecord to keep configOBUs only,
+ // otherwise cuvidParseVideoData report unknown error.
+ extradata += 4;
+ extradata_size -= 4;
+ }
+#endif
+
ctx->cuparse_ext = av_mallocz(sizeof(*ctx->cuparse_ext)
+ FFMAX(extradata_size -
(int)sizeof(ctx->cuparse_ext->raw_seqhdr_data), 0));
if (!ctx->cuparse_ext) {
--
2.35.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
