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 A77114F487 for ; Tue, 17 Jun 2025 11:42:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7011C68C33F; Tue, 17 Jun 2025 14:42:05 +0300 (EEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazon11022130.outbound.protection.outlook.com [40.107.161.130]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8EEDB68BECB for ; Tue, 17 Jun 2025 14:41:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E+mnXsxlp29f/YJZktcexXKsL2ogSQExr4kVKwDMQiBvBBPEEkeHO5ot6yyevPO71JADfCWyjz7p6oCGA1hJ+U0hG0kQf1F2xWhw5Zl5fq6jG2w9mx2G6AAEDvCOBN9kcK9MqQTGn+7VwLNTiowVjM6S3JzPWug+33uKrRFoNjGytD4JwxOhgxbjhV4sn82MHY1DIxQYI55sEGU3HNr37m/4cOt+C/oKxJglj3M6gD7v9nnTj3wlRVUsrA+mltkyY+v71XPuoof5A+d8o6SIIQzw5ZNk9dXpERwWbcvlv42cTLd2dY1TUsah6y0I1BMqa9KIPzzwjmkDkE/1yRtk9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8MERxf4m46EwuuvCSWWBPE1zwMq71+KuHeqWGFhWrNg=; b=aHNWQWFtEH59zxPiTh+Ip+geSFV45XHytMvMbI2ljlCdGqs+7TIPxC2xQ03IOJNUDP7ErO0zFjQ1AbWjOdQw3yrjdHsRWavOsekYfg+SXy10lk5wEDPJRXIX2mU0GZDyF/ItOz9BK4+NnKNINiOWXPLXiyrFWlTUhRnunH4v0XrnLvgXLLBPaRHV/za34B+uTqSFt5vuTokUrQr+pq6PuFzl0jisSXwixCjBDXkaauW3XniawJ1JaA4VCdwUdG5La/nGxo1NvyK1pqDARcmJdvIcIhx9az+AOikJvhxZYlpjf8b9X3bQHiV0EORTfztn9uhfIPBC0vFVEHMnkAlSVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cji.paris; dmarc=pass action=none header.from=cji.paris; dkim=pass header.d=cji.paris; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cjiparis.onmicrosoft.com; s=selector1-cjiparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8MERxf4m46EwuuvCSWWBPE1zwMq71+KuHeqWGFhWrNg=; b=WhCLio+hIYi5d08tGU2ASdReMwnX0YJvctqAT5WkgeAr9tHSXw2DitdKJXpCluwFIfYeOsnDIaEb3cQR4od6VM41wJEkib2WJYm3JhcTquCuunf3qtvu4B8tkPbe8rdFRVbKpuORvdgt5F+lkPTRbyJr3RRZkInA4IRN03DUbP2IEY37S3lFGaSQgrbtBPs/mGVr/b+84Z1zBWupEOz2B0EI8J8oGw2/q9RfjtllwYt1G7bb5B6l9IOUcai8IfDy2Yu1bylb7ggIVsOtApji6PHlTgeEZFr1gzi24o9UkvP3dvGEUscJAj+dRCAVvsixU4MrvJVJqoCYhD+xa3RHHQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cji.paris; Received: from MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) by MR1PPFE419BE4FB.FRAP264.PROD.OUTLOOK.COM (2603:10a6:508:1::2db) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.18; Tue, 17 Jun 2025 11:41:55 +0000 Received: from MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM ([fe80::a9db:c8aa:ffcb:e463]) by MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM ([fe80::a9db:c8aa:ffcb:e463%5]) with mapi id 15.20.8835.027; Tue, 17 Jun 2025 11:41:55 +0000 From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Jun 2025 13:41:04 +0200 Message-ID: <20250617114150.165659-1-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.47.2 X-ClientProxiedBy: PA7P264CA0345.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:39a::13) To MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MR1P264MB2483:EE_|MR1PPFE419BE4FB:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a04dd53-ad27-4c13-46aa-08ddad93f5ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UPgMPx5gnRMJB2RR5UOYe+Cbwfqcx+M0k7/yx9RUNZmnCb6b9xpGBnqVgtuq?= =?us-ascii?Q?ROSPd4RDCR19c+mWRnU3+3y02hKBZOH1CNhyRUhLssXmTxgnN7ESvDEg9pCF?= =?us-ascii?Q?Vmm+g52Wpq9W7nM6/I02pGwnKmgDCVlsllzigQy8mYB3s2gzz6xlYdEMdZKp?= =?us-ascii?Q?HRTdssFwy/yZNoKZIzoR56fiqSBRxNljjeC5SBe5Tc7Z2ZTwcrcEhGPPDtcA?= =?us-ascii?Q?iuJjAG+n40iMEx3M6nT6hP6U/7t4/mtn/Wlt1FeOMyA7jPE+QRxvKf0pDO74?= =?us-ascii?Q?Sc2UXGv9ABZ9r2mQLN60C+0CR+tc913HpQVjKXZc7slsHLo6tkCRGkyfLLZT?= =?us-ascii?Q?dMICGeiiMlayAJbcMd63qMIhiE7MIzJZoJo7PM6B2wbgOEg4wOWFxrImTnE4?= =?us-ascii?Q?dBxc7E2vDi2QIOjJ6cDO759/hCcgAqxoDaP/phTP/XIerhToHlcVYTU4+Jpk?= =?us-ascii?Q?rv4+up3iHVKUOoYlWpouZ8jQtIPKRH7yF6M/kDNvMmLJ2ed64/EjhmsRshuY?= =?us-ascii?Q?pr8fRcRFMvwoM8Ow3j0lUHRQZ8yXJoKnDZilsHpxoaOaeqkL+SyL+q8f9nWH?= =?us-ascii?Q?peWXOx0QpOLd7zxMga4C2c7qnFc6gU0AiQKq3TpRGDhyIU5wP9JJWl/p+N7n?= =?us-ascii?Q?vWIbM+59maWEd7F5b2isOr8JbX9Q4rGvwrdwfqElNiZB8qve4cPxum66K65o?= =?us-ascii?Q?rM/l7LsIFdZxmTOfmijviIYWPgXG6/vtQSmqBhvRq61yKnXrmKjZb5xHM0Vk?= =?us-ascii?Q?/LWD7j6D2HHNvmoqA2LoDuJCThIBuk9GYprLy3uM8lGoZhI7OypJhcttHmNf?= =?us-ascii?Q?NJt4qx7Let3cEw03lU9DRYzcw5IvOzG5T3bBFrmZeNUhhPo0fvLoV0qPGSmX?= =?us-ascii?Q?ORWG06Z62eFK5hkqMNACPdNJQAuIkseD+Jyr450Bi9QLdVI5DWxBFrf9l4Jn?= =?us-ascii?Q?p2vfXCacwCR2jv78XuA1Q3jOjJVsVLzwOOgRJWU+HTqHyp9k0HeTY2siTyj5?= =?us-ascii?Q?e/sUHJE8iqjTyH5KC+z6yYVJdV2l1bnRhgQSz5JCMV6oNRRODVhf1+WTfTpb?= =?us-ascii?Q?J7jNw8rFHHsXstIuT4IvfP3TRZJwfwJ9xKU1bwHLBICuE9fAEuty3bcJgCq/?= =?us-ascii?Q?fThDHjNXT/XRd4BjoEiPyb6F7Ge+5eLbpf3sJ2N3evJeys8h4MXY30gTQthP?= =?us-ascii?Q?nq0d2kkNMsDzaVMQkMoHnM09mADESyEWSyFvCiMB7NKiD1UYV3MV45a7h90t?= =?us-ascii?Q?z+kZjQx93MM5i6M4TI6CFaTpOB/IfAnG4Ie4H7HTMya0oRMrdoTjPkq0dvpl?= =?us-ascii?Q?gTPgG3CPVwCiTXZwDhSw/UAuTRRxsRu4kEn6l+StOMJV4xZneZKmsgoD7VHO?= =?us-ascii?Q?xPbq1Eay2hIsOg6qlSQEUmmytwX6owlCLDivObx1KoC/JdoKi7bDujju2Ivj?= =?us-ascii?Q?hw9tJE9J5mo=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(366016); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RezQ1kK+q9Jj5pPm6YZe82tQzG8kF5Rgq4tgtnxu2D2tPqVsDIQ/eW4IB7zD?= =?us-ascii?Q?/Zo5m4PPeuWlNlpqbcBSXLrYq6PBL94+iQK1YjY0jb9mV/xRhCmfAMtrmOIV?= =?us-ascii?Q?AQ7pwNqVGzJg+gmevGRxouiPTcmcogtWk3quA6UW+YfFu96Qb1OAZ/bEOXLw?= =?us-ascii?Q?C3EXExfsvC2u7vZouhup+A6Iu7hM6S45M3Gz08+haVUkCq1X9qRh0T2qzQIE?= =?us-ascii?Q?jfEeqeGB3ZkKx4X90JtF6vVMGIqVm5hksJ9FC1H6ZSP/Btv7AhBhqto5AlCM?= =?us-ascii?Q?NnMhBps7cccfQsROck41Gr0EZRsIaaKx7YGqjAkGdk28p3FjM4HiCba3pjxR?= =?us-ascii?Q?0dCByH8XqWzqhE+m8wMsBHiFsUVAwErfqAUk2dRHXYHsbAx342wAphi4stsJ?= =?us-ascii?Q?QPAHDPcIJLKECegROCUySpmiwGYtdwd9alSAvuVTKNGeW5P4g3n2k0kxBbF6?= =?us-ascii?Q?Z9JjbbCoGpqfA4+zczdANq4SA2Dun6wetxrurCHNhwsNOCbCk5M+OKo3d2/V?= =?us-ascii?Q?TAsDA4l1IU9vYd5JxVgdS7TqHe91YBY0wZzt24R0TtQryOwnKTwSdJ8YRjli?= =?us-ascii?Q?zqgEUnHejTgRuIxj8+NsilvGsff8VUNjgTJXZYZ9ghZDZRx3nNFlXje2IFYs?= =?us-ascii?Q?9gu+fArvExdF/OqHFlojSr+QByYzWEzY/QctcxeqYAke4Hi+Bv28P5U0pzN9?= =?us-ascii?Q?IxbFlsofNXLMsms/P++wwtAZA99gsvxcQQ1gP4H1BeYdhCtGmTkk2B8yjADW?= =?us-ascii?Q?/AHEc9CxUl90sDLUwK/dJM2iwJSthc6v9twBoYCoyuiuB2HTF18N5TZnAGj1?= =?us-ascii?Q?jbo2lzbvgMk83VPTHzhZuuPYZOkaadoc8D4wz6Id5wI8pka8vQCdFeGBCnEb?= =?us-ascii?Q?GRQX+L7zpNEDgclyt2GESX015bKcS2LZGV7y3NS5HIa5/ExVZkbxdJUVnvk2?= =?us-ascii?Q?BmVg93WaRgMYK1OhdouowYoxbw3+jo0ftYvXyUyO821yLG/+rKenz3zexSWh?= =?us-ascii?Q?iVGWO6sfHsoXo/mT8gdHoKpa5Ql1q3vlOu7ULiAIW1WQamn4wbHThzMms2lz?= =?us-ascii?Q?BVB0mzO7zjqEhO9cORhig+qOZsEa00STmSGtEDc1d5cHFvwOZb4JNTnJubS/?= =?us-ascii?Q?/JbB/4MXGo+nguA0lySO3c4RkB4GliwQt/ue9+wDpW2CbMfwi8n+ja65ANzN?= =?us-ascii?Q?Ks20NJWO7J5+NpCnV6qM9aa8Xr6k6LJh8RcJPs3Y/C8WuvtV9zET1j0j/yS3?= =?us-ascii?Q?yGWW4RVEz/av0sEvXyFS4I1FrKrEN8xXFTskjhGY0K2WjsZRS5PYRu5L9D7v?= =?us-ascii?Q?RQjot8Cfmt91wlUl428VPVKuTbzrLggEkWrAAaxJ/yq5EpT1Ui6I4cS7ifqj?= =?us-ascii?Q?bvPBDZ5G1HRQWXlzFsnvpAMyrVR8p1wpMisfxGHyeKc8WDoRpCAPH0JlcXoP?= =?us-ascii?Q?pE+kqacJjXSqgffvmt0sAwFv5WawpuNVbzfJefZJGABfBy3ILPKbISyvPeqy?= =?us-ascii?Q?qonX1R6/vAOm6lYJRNARopPcyJxzkNyF1Efnl2qw1vSjm28wazyyFt51/QPY?= =?us-ascii?Q?iQNwRgO4Tmm2ypXSf4uwtm6tnnWnNUqVMfZiY5sNt+ZCvEeITUINgUUI7zbF?= =?us-ascii?Q?2Q=3D=3D?= X-OriginatorOrg: cji.paris X-MS-Exchange-CrossTenant-Network-Message-Id: 0a04dd53-ad27-4c13-46aa-08ddad93f5ae X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2025 11:41:55.2593 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fc5390bc-7da7-4e42-b72b-a373be305b62 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pRRYGjBptod2nQ8n5R9rNTUu56t++YIy1zu0dFdvporJJx6Vfn9gBOuzyErOTg7Ae7oGXGktdUFD6hugY5YxINRMPo1AJnjzeXQFYqANUjs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1PPFE419BE4FB Subject: [FFmpeg-devel] [PATCH] avcodec/aac_parser: fix aac profile probing 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: Nicolas Gaullier 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: Reverts 64bb91fd3b5a00a8849531c7e8dd207f2a626096 except the key_frame setting for aac. See also 696ea1c2236842572df88d573e24a39be3f19c98. Don't force the profile as it may override the correct value set by the decoder (HE/HEv2). Fixes #11600 Signed-off-by: Nicolas Gaullier --- libavcodec/aac_ac3_parser.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index e10ce13a3b..1dcc2e735f 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -147,15 +147,13 @@ 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; - 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.47.2 _______________________________________________ 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".