From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 68D7A4D150 for ; Wed, 10 Dec 2025 17:22:17 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'IsIO5Lvu5RXupJjzIJ6zrerJBrtZQ85GftWFNxMOfHE=', expected b'4+D8OXFRvmIoB0w8xg9zWRrgxFvYRBhC6iiqHB+hIq8=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765387328; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=IsIO5Lvu5RXupJjzIJ6zrerJBrtZQ85GftWFNxMOfHE=; b=mK/sqz9HTIZ1FvIbTenFlYH0iMHnmz8ztGDPx5QBcDXY6Kj/Jv1f2wz7wXD+L85FR4TIQ yQAl5Quwb08BHPsGz6MQ0LwX+K7JygMvHjvWwScKIWY8dwrpHLDM4RbaMxPr5oOJp3p3t3L 9ckISgiMi1/AyYEiIh9oXIyTJZjk7oKIqcTSg+H+UzRIHk5rBRhjI9dk2YgApQN0ohkn9jG 2ceZva8p/m/SioXsAq0xcQTn6hmAvt5ttXIRpiOPdDcHqCayYX3Pd5t1JnNkYAD+czWQM1A TXaTnGi7bWCUreprqywSEv14v3pz7wLZ2Nlqlc3VmYTN0ghOoSGIpGtzJWwg== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 19306690733; Wed, 10 Dec 2025 19:22:08 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1765387312; b=lt1iS9tjZ2yVG7w79oaiyT7hVIYPwKQtLH2K+ljm2svYET1pGGZoSQcVKEECxcuY3yIiD dyibNrAgqaavrTCQB64/dNglhO3GHHQyrGFNJNYXCbB7PIJNtJT6qQReNY6UaJh4eiqDp1C Qc8gNUuizeSerpwG/2RVz4NKS9sQ/5Jh3+jZQHfnf/dAwb4xfGl6GLLiVcY6DGEDgcGhawB 5swoU10mw1Cs6maRVcABcB+Xkn/eLkUemGF5iComJMaPgqodWuut5oodsN0LL021wTYHlWv fYm9IZE1Enu9ctbpfhld1AYdc4AIyI2YQ2n5gLqwUgK/1f4b9apXUm8j0ZEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1765387312; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=nBLatAe3JhN9JlGpcFg2jLezQ/g252tJ1ocu/ATx5lQ=; b=nWvSml24YESk6az51ZoziF0Dw2C8VVksBUV2QKxyM8vjI/VVMYtandCX0pz11o4IP5u/e oHnAVj8P8KsE+eP6JtS+WmCvlKyXIJTpDIwYrkOK89gYFJ11Hcc/Sc/pMjSiAveM669zZlb IIgb2MghUW6tV3dcjeFkbQwvkJtectu7MmC3oGAOtXAmG8BxP46rvO5bI9j1la3g9NwCMb3 6J4icnJkKaYDehFJOJyCH/aMPu9UvJDZRPTEUJK3ZWs55pG8Kh9OiR1kHwW0O/nEEL5P2i1 2TqdnqR1W7ZYtNa1bx6bD4yMPR0Br4W3ar8LewXv5JuRA94nF2msFM9T/wjA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765387308; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=4+D8OXFRvmIoB0w8xg9zWRrgxFvYRBhC6iiqHB+hIq8=; b=AEikYNStBavltmWTEmogUgsjLdmlrsRjs38eV0GFtNpg+qa1Vk96Ojsi6F16SolFgh8nK +b/oeCAbK3l/7KtwVSTo9wQCGASiquzHfdE4JHGJH1tL3zBY6F8l3834vPE8MsU8u0nfEuQ fhD9LshfsT9mARuyYjPYaUKAoLRD+ittHGBxiybEdKQKn13irdK2G7+m6SsZeokjP/OaPHE LyoljKl/vjPExLLicM1zIpdcRINnk616jGkOmQWuHWw8OT9TbQ12uVQDnYlEmhoB9psnqex 0Gr5kbBQSqtfFirPvICan/EM5a27djNG/hRybGkTS9KMQwLP5IikdjCaClzQ== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id EBC3B68008B for ; Wed, 10 Dec 2025 19:21:47 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Dec 2025 17:21:47 -0000 Message-ID: <176538730808.39.16461318999617227466@2cb04c0e5124> Message-ID-Hash: MVBJQP6MQGEM3AF4MJPXOZ5YXFKDUU53 X-Message-ID-Hash: MVBJQP6MQGEM3AF4MJPXOZ5YXFKDUU53 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] release/8.0: avcodec/aac_ac3_parser: do not override the profile set by the decoder (PR #21158) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21158 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21158 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21158.patch Backport from master branch. Fixes issue #21152. >>From 047538e7e00c8f01b9ec703efb970c7cef3e7969 Mon Sep 17 00:00:00 2001 From: Nicolas Gaullier Date: Tue, 12 Aug 2025 12:35:16 +0200 Subject: [PATCH 1/3] avcodec/aac_ac3_parser: remove unused USAC/ADTS code ff_adts_header_parse() parse the object_type from a 2 bits field. See also 696ea1c2236842572df88d573e24a39be3f19c98. Partially reverts 64bb91fd3b5a00a8849531c7e8dd207f2a626096. Signed-off-by: Nicolas Gaullier Signed-off-by: Michael Niedermayer (cherry picked from commit 9bd10fa32cce741fd0dd900ab9db28cc00e3c9b7) --- libavcodec/aac_ac3_parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index e10ce13a3b..ced640dd28 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -155,7 +155,8 @@ get_next: return i; avctx->profile = hdr.object_type - 1; - s1->key_frame = (avctx->profile == AV_PROFILE_AAC_USAC) ? get_bits1(&gb) : 1; + /* ADTS does not support USAC */ + s1->key_frame = 1; bit_rate = hdr.bit_rate; #endif } -- 2.49.1 >>From 571be3dc1603a1b6af63a5201b7ec9bf40b44b87 Mon Sep 17 00:00:00 2001 From: Nicolas Gaullier Date: Tue, 12 Aug 2025 12:35:17 +0200 Subject: [PATCH 2/3] avcodec/aac_ac3_parser: simplify Use ff_adts_header_parse_buf() wrapper to simplify as GetBitContext is no longer needed (it was introduced for USAC). Partially reverts 64bb91fd3b5a00a8849531c7e8dd207f2a626096. Signed-off-by: Nicolas Gaullier Signed-off-by: Michael Niedermayer (cherry picked from commit 593b4269027ea6d514b8505d317f6f131693c84e) --- libavcodec/aac_ac3_parser.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index ced640dd28..b49ce0277c 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -147,11 +147,9 @@ get_next: } else { #if CONFIG_AAC_PARSER AACADTSHeaderInfo hdr; - GetBitContext gb; - init_get_bits8(&gb, buf, buf_size); if (buf_size < AV_AAC_ADTS_HEADER_SIZE || - ff_adts_header_parse(&gb, &hdr) < 0) + ff_adts_header_parse_buf(buf, &hdr) < 0) return i; avctx->profile = hdr.object_type - 1; -- 2.49.1 >>From 485b823b8484a920ce2e9542e07e6c7e43fd80d6 Mon Sep 17 00:00:00 2001 From: Nicolas Gaullier Date: Tue, 12 Aug 2025 12:35:18 +0200 Subject: [PATCH 3/3] avcodec/aac_ac3_parser: do not override the profile set by the decoder Parsing the ADTS header is not enough to detect HE-AAC v1/v2. Regression since 64bb91fd3b5a00a8849531c7e8dd207f2a626096. Fixes #11600 Signed-off-by: Nicolas Gaullier Signed-off-by: Michael Niedermayer (cherry picked from commit f24474dcfc719e29dc87e6483d6187ea233f4e0f) --- libavcodec/aac_ac3_parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index b49ce0277c..51c801214c 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -152,7 +152,8 @@ get_next: ff_adts_header_parse_buf(buf, &hdr) < 0) return i; - avctx->profile = hdr.object_type - 1; + if (avctx->profile == AV_PROFILE_UNKNOWN) + avctx->profile = hdr.object_type - 1; /* ADTS does not support USAC */ s1->key_frame = 1; bit_rate = hdr.bit_rate; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org