From patchwork Fri Mar 8 09:49:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 46900 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp831044pzb; Fri, 8 Mar 2024 01:49:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXrFeN+C1S+2P+p9w51I/RSE9If/HGm3/XmnPev6xOjbiRqyUSU+cQ4xlqUlR5vCSbZ1Q1+NOivtOpHkmDi0pfktcbesR9WUtGyww== X-Google-Smtp-Source: AGHT+IEUnAR+t/HUtwQdAHae7JQx1SOpgu2MZO1i9ZP+Wud+SB5LsgL36dF/nVrarcxxwx5YZkri X-Received: by 2002:a17:906:30d0:b0:a45:d9db:9275 with SMTP id b16-20020a17090630d000b00a45d9db9275mr889041ejb.1.1709891389432; Fri, 08 Mar 2024 01:49:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709891389; cv=none; d=google.com; s=arc-20160816; b=Wh9OudGlL/XirST6txfOjgyh7pFQ51s48a9Zr+adgjwNxyqMT4TUYEVrW5KCo4Oob1 dP5ksvaNqmxpn1dj+RS6TDxs40Ac9J7P7Tnq1EDD8GBk1KEF/to54vm7hR2xFPA0TKcd M+w2pQxn5BCSzqRXJYYytwh5V0aEMzBZlQFe8Uir1LVsJHdXup97/beZSBPZtMf/0koV Q0jPXWpBcorvbjcA6hDm7e28AmUlEsUojufUCO94jJEnWAHAX0tnayaRrA/pmMY/Ek5E jC96ll/mFxcRQEBeu9wb9iBnnQRCGQPaAmp0xZYTz9YIhiND3j10gc35IzwsTKeh98Wq YE4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=beJDeAAa9xm/62HrFtYnf/kEgONHdSqtXIjv7r40ykM=; fh=w8JR1T/5WquwCqgnlKgniZcITMXOtCHDzF0NyyyGKZI=; b=hsmaLTy/qJ1mGLA2lOlRFkNPib+nk5bXN4W7GCLFevjF/BfVJxgIoAdcooZgycBvJd ahLG3yIbPXOYiVMVSfPsR2KMujY8IOlHSfqw7kocjIvsz05yJZpc5o8zsg/dGLE8LFIG FimBtorrUoezOHmDgckXTzv53T8+oMR8grtAGng4ATRSVS8jJV7+tBBj2DpJiixGf6Fb pLNLQj1xYERhL4jeBCOqZQ9lVOBbQmBoYrCaTxpYOYXYL3h6XUhoVxLQCoIDJ5XXcc0w XLZSRtZNONBh7Wj/cdVBsOxKbwdxnttvrM1pZzBuU5xGS21Gl341baU43SrVLVuH72AR dJug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x10-20020a1709064a8a00b00a4444ff5c9dsi7444678eju.244.2024.03.08.01.49.48; Fri, 08 Mar 2024 01:49:49 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD93268CEE5; Fri, 8 Mar 2024 11:49:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 417QDPREWGHQ 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; }