From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1B4A249CC9 for ; Fri, 8 Mar 2024 09:49:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A89EF68CE3D; Fri, 8 Mar 2024 11:49:45 +0200 (EET) Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BB8C68CC28 for ; Fri, 8 Mar 2024 11:49:38 +0200 (EET) X-QQ-mid: bizesmtp69t1709891371tz3foepg X-QQ-Originating-IP: h3QYTBnpdqYtoT06xZ9rqzRe+J70gcLfzU7DpKDWNgA= Received: from localhost ( [111.196.213.76]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 08 Mar 2024 17:49:30 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: 3M0okmaRx3iLUgfFg5ar2/haWe8Ss1waJQ/lGLVsxOYJfzgqhWKyktUstznos ZmCGgGFHGvqgzpbaTriPt18FyYT5FU5lpHb4ZIbDgeMb5th6fFv5WmbxXdzyQNdCtKtXA+F 81plqoSYqEYUSdGPLMJjmAOkSHL0lbFWMz2gtfRv1J78/bDiO7S990zXPapXS+xCTj8G/fO 1EvUTsgtTIa/I2FOwVM9rsMk3iccKvvfSg9vkzJHSK53wCzKMuRvgbXRjIHdJIbJrC1siJO 1XXiSx7qlrkwer8DNm0MIbTCVDX/NFIW6u6jpZG0CUE5EjawPCSruyQHkPvdXEZDG/PmCvD R5K100YBz7AWWgE/w/Dt3T69hoWf/Eo7YpxW3hT X-QQ-GoodBg: 0 X-BIZMAIL-ID: 7878631505438427046 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 17:49:28 +0800 Message-Id: <20240308094928.62556-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-0 Subject: [FFmpeg-devel] [PATCH] avcodec/libaomdec: decode extradata in aom_init X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: before patch: test failed when using libaomdec. TEST enhanced-flv-av1 --- src/tests/ref/fate/enhanced-flv-av1 2024-03-08 11:27:13.577935587 +0800 +++ tests/data/fate/enhanced-flv-av1 2024-03-08 17:38:25.810152322 +0800 @@ -3,7 +3,7 @@ #media_type 0: video #codec_id 0: av1 #dimensions 0: 320x176 -#sar 0: 0/1 +#sar 0: 1/1 0, 0, 0, 41, 4718, 0xc4d912ec 0, 42, 42, 41, 5109, 0xc065dd7d, F=0x0 0, 83, 83, 41, 192, 0x160c5335, F=0x0 after patch: test passed Signed-off-by: Steven Liu --- libavcodec/libaomdec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 69eec8b089..2df2fa6fd7 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -58,6 +58,18 @@ static av_cold int aom_init(AVCodecContext *avctx, return AVERROR(EINVAL); } + if (aom_codec_decode(&ctx->decoder, avctx->extradata, avctx->extradata_size, + NULL) != AOM_CODEC_OK) { + const char *error = aom_codec_error(&ctx->decoder); + const char *detail = aom_codec_error_detail(&ctx->decoder); + + av_log(avctx, AV_LOG_ERROR, "Failed to decode extradata: %s\n", error); + if (detail) + av_log(avctx, AV_LOG_ERROR, " Additional information: %s\n", detail); + + return AVERROR(EINVAL); + } + return 0; } -- 2.39.3 (Apple Git-146) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".