[FFmpeg-cvslog] avcodec/cuviddec: fix AV1 decoding error
Zhao Zhili
git at videolan.org
Sun Jun 26 22:54:31 EEST 2022
ffmpeg | branch: release/5.0 | Zhao Zhili <zhilizhao at tencent.com> | Fri Jun 24 12:04:04 2022 +0800| [3607d7bbea4fc3e601774e02ef734097f2d369af] | committer: Timo Rothenpieler
avcodec/cuviddec: fix AV1 decoding error
cuvidParseVideoData only supports pure OBUs, it reports an unknown
error with AV1CodecConfigurationRecord. Check whether extradata
is AV1CodecConfigurationRecord and skip the first 4 bytes to fix
the issue.
The bug is revealed in ffmpeg cmd since 45e3b6a68 and ffd1316e.
Signed-off-by: Timo Rothenpieler <timo at rothenpieler.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3607d7bbea4fc3e601774e02ef734097f2d369af
---
libavcodec/cuviddec.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
index f03bbd8c4b..1a1906e1f2 100644
--- a/libavcodec/cuviddec.c
+++ b/libavcodec/cuviddec.c
@@ -951,6 +951,16 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
extradata_size = avctx->extradata_size;
}
+ // Check first bit to determine whether it's AV1CodecConfigurationRecord.
+ // Skip first 4 bytes of AV1CodecConfigurationRecord to keep configOBUs
+ // only, otherwise cuvidParseVideoData report unknown error.
+ if (avctx->codec->id == AV_CODEC_ID_AV1 &&
+ extradata_size > 4 &&
+ extradata[0] & 0x80) {
+ extradata += 4;
+ extradata_size -= 4;
+ }
+
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) {
More information about the ffmpeg-cvslog
mailing list