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 6941F49CE9 for ; Fri, 8 Mar 2024 12:56:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F61768CF38; Fri, 8 Mar 2024 14:56:05 +0200 (EET) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C26CB68C545 for ; Fri, 8 Mar 2024 14:55:58 +0200 (EET) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-5ce942efda5so572696a12.2 for ; Fri, 08 Mar 2024 04:55:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709902555; x=1710507355; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=6hr6qYheTT//fA8nc/mRW/AU7+icasmf27i8DC4j8l8=; b=jpKP0T1LF1TS4oOLQIujLCEPKvaBbWw6I3HvgFn+qE4v7Bp6FnOgY+ICNcWM11WpZj FH2NllYdirXrsbuF4dUCxUomVpfumIFoiubl7XryrHRCmwuE3rsWLgULQoWV4lPiItsG oXLzBPuaCvi8fq95PEc0rJ0cPeKBZS/4psdKCPeTpjbYYGAb+myIidrsfpxnqXPcCFsY SKk76I4vp86LZlsvNenyN/yWRb0n1F2tSLU3UMPizOXxQsxKo7yBezmS2R6SNgZwJvTR 2TOW2GWCsutQ/Bmcnx8eJvJp9yVxSRFRDF9wILZXVh35hxLQ92dLbTzJo/BEBDYqWKwA Todg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709902555; x=1710507355; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6hr6qYheTT//fA8nc/mRW/AU7+icasmf27i8DC4j8l8=; b=eie//2GWpkuQnWFZRxtrFCdOE3gCXnUqDaHkiAWYCGdSQEU9wMAEJHJIoPvqbN12AD hqldfdXJ8/y7qwrWhlKZAjSed9RWKAMKvTi+HyDK4MWH09bpCjspsowrPRHqy8/VW8+i iuykVn2NxOECwlS4/lGYSmlUKQ4MrkIH2bdYsclHuU/SxA978EcF7KvN7eHXnW+6+dJa U77YLRr0UhBIvBja0lJd0PJ7OUAyifrSvo09dhUrv4uckN4xljnFKgzPDY5XYK0dLqP3 l6lnpwBC6epbpWPJqFWdq46T2qO71GU37cIcx5YTSq9OgpBJtIRx0tRzrIE5Esv43A/M a+aA== X-Gm-Message-State: AOJu0YworAvN+Q+NYAV/oo2sx+p2NN+bsQyM5M7A7Z8RbnGbo8ha9nm+ rZj9mQeTq43wxPPNv45SvPk9KHOTKQ7zkdczY9HBYPfEd/bJFKCYoYpRno4e X-Google-Smtp-Source: AGHT+IEptu9NDTD6dHPJ18njC5Bn3GYy9/blVcnphbU4ln+qMILQJ8QHR9RfloNg9yKDvtAEYK31mQ== X-Received: by 2002:a05:6a20:7d93:b0:1a1:6aed:549a with SMTP id v19-20020a056a207d9300b001a16aed549amr7527529pzj.3.1709902555494; Fri, 08 Mar 2024 04:55:55 -0800 (PST) Received: from [192.168.0.14] ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id t15-20020a170902e84f00b001dd7364596bsm85589plg.57.2024.03.08.04.55.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 Mar 2024 04:55:54 -0800 (PST) Message-ID: Date: Fri, 8 Mar 2024 09:56:12 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240308094928.62556-1-lq@chinaffmpeg.org> Content-Language: en-US From: James Almer In-Reply-To: <20240308094928.62556-1-lq@chinaffmpeg.org> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/8/2024 6:49 AM, Steven Liu wrote: > 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) { Extradata may have the ISOBMFF prefix bytes, so you need to skip them unless aom_codec_decode() can handle them, which i assume it doesn't. And of course, if there's nothing after the four prefix bytes, don't call anything. > + 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; > } > _______________________________________________ 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".