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 F1A33477C3 for ; Tue, 15 Jul 2025 07:39:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id D6CE768DC63; Tue, 15 Jul 2025 10:39:05 +0300 (EEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazon11022128.outbound.protection.outlook.com [40.107.161.128]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B97A968D6D4 for ; Tue, 15 Jul 2025 10:38:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aLtAMp8+k+OE1RJk0AntQSno1akDwatfD0AIgPd/+qePYwz7T8jkgjWsBC2od9Y1HQUEQju+8HzohlcYi/YKoBZ7OFPzwYNNkausWOrLZsZTijTi46rchRp8AkpuBhB2DjLPiFufHlE/i+/kV3ecK34rPGwWe0L17ud5zfmtIS+DWnXWW3PFnPtQ/x9lrOfVHFwY9jz1ANWTJcY5fg4vdZpnEbybi/BXros0gRDLz3qwDpvPwUcvAofPJ1i8r2tMBPW/4rp3HoBfsNPIS59VWvZ06vECSLJVlIbPEvA3SDCkPWTCSxD7nn4wHjG67b3trroXGJroVPl5xLF1AZscTw== 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=dXBBXHeML5puS8J+VAsYoehSz9KLlN0+HKDnO3dA6ZI=; b=MPwKyEjvQ/JLAHBoCrXdpP+5dRgYdIrvpRBE6XmP9GojNeXogY3l9GGnHGN+mRJm6MU3/YeBuYrbhWZNB+QGRxUus/GFVXOj9cBrD+J+6OYlaebfyQZ2mVmczdkC5f2K94HuRsAdDt3iqCVOX3Fd3W4cKbvDcThhxUqPVN15KynIpLCOz51TXm6pUi9ScgCxifZk5JjE3aG8lIVEChTrRCyHAnInEOP68+/oGeLJ0I95nIPsuzWtQFh2jsH/W3Yhql/Z/DLud7qQuH7eu2dvTOvCB+G5IbJ8E6khH8TyODcZ5WUzzONvFQYAmynfIXtl4xj0t6sptGiTY8e642K1Mg== 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=dXBBXHeML5puS8J+VAsYoehSz9KLlN0+HKDnO3dA6ZI=; b=vu7GdNVrx2hTW4YmRZBdlB/S6IqBDP3gfDOUPXWVVnw2AyK8Yk9y+6JGkGuyfa5yK7dk3v/scwmCLucZYaLTXRjbUfmF1Ldhmhw46HlCT7WhCmSlzEcx/ggyWZj8kxKXunBq7GzGFzO9EWYJW+GK6k7FW047TeiIuhK4d1KrWsqyzHWHJC3vV3Rp5pbRnmn8m1JR5lHPZsYKkzC45dS60rDTEdbfOUOU+6JiRXsZ0XI+dSaccJeSv7dYB+53fh8ZXRFtMn3H0XYJ++zKVdugs+cI5qHj7szODF6J2/NbBGmZycdMHTZ4RW0WCDbF/mEnmTK3ONSnJO95b9ufyLK7hA== 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 PR0P264MB2645.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1d0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.32; Tue, 15 Jul 2025 07:38:56 +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.8922.028; Tue, 15 Jul 2025 07:38:56 +0000 Message-ID: <8dc41b4b-6f4d-405e-ba66-77ed851d43d1@cji.paris> Date: Tue, 15 Jul 2025 09:38:53 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250711095439.332634-1-nicolas.gaullier@cji.paris> <20250711095439.332634-2-nicolas.gaullier@cji.paris> <20250712105258.GY29660@pb2> Content-Language: en-US From: Nicolas Gaullier In-Reply-To: <20250712105258.GY29660@pb2> X-ClientProxiedBy: PR3P189CA0020.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::25) To MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MR1P264MB2483:EE_|PR0P264MB2645:EE_ X-MS-Office365-Filtering-Correlation-Id: d9d53186-c3a5-4fe0-0a89-08ddc372a65f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cE1SRFc4ODR2N0FtZ0RkenlnMGl3WVRFZmc3OHpraVpKbUloM0hYejlGSXZh?= =?utf-8?B?RmFldTVpY2FNNFFPZ3pvM3R4UHUwMXErSXAzZktIdGRYeEtMMVFUSS9CdUFF?= =?utf-8?B?dUpCd3M4Z2xmaGN0VnR2bnd6QjJpSGJ5RXEvYkE1cjhkWTNRQ210Ky9mUko5?= =?utf-8?B?bVJrQTJoSSswa05wZitaM3drbXhraWRQQXQ2NXY5OHdQNGFqLzVtbklnOUtV?= =?utf-8?B?emZ5TnkrdGNzWSsrWWhLUXhaZmZxOUlCZjBIdzIyY3JQWkxLQThNV01mYnBr?= =?utf-8?B?Z0Nlbk1icmVIb2RMcFFlTjk5aG9USk1NOUVtRm5GM0ExQjRkVWh2YktPeXYz?= =?utf-8?B?U0FMUkwzV3o4czViZEErTFZJd0Q3aWQ3NlIwNVU2bGhWMjRBQURrbHFuNDF3?= =?utf-8?B?eW5MNVo1MGcyTjFMcGhjUkRSMXdBWkxQN0lweGFuYkxpSDMwNVJxZk1kOUNT?= =?utf-8?B?T3NBS1hwWWhzTTVRRDF6ZDBPNnkvVHh2dGxPSXdBaXlUdWxUbm1HeVhiWWta?= =?utf-8?B?bXVDempDZEFEamJkSmNuNVdnMHNKWUozbU53NkVGUlJaMW1yczl3MjQvWUMz?= =?utf-8?B?NjRIc0JZbnVodVRYamVDZGg1ZzJWYjNsZ2ZmalFmT2FKTGRhVEtjcGdXeGF1?= =?utf-8?B?cjJDK2RpcU9QWG52akdNY1BhR0hFbnI5bjlRRkZuNXJtc0RZbml1SnhKODZQ?= =?utf-8?B?bTdLK1hERUJ2TGUrZFQyazd0amkwamF6ZWRYYk5Id0FCc2w3VVcxOFFKMm1S?= =?utf-8?B?UGZCdkU5N1ZzVnRQbmJBUm1xSkFVZkVjdnVQNE5JeE5mVEFjcnltc0EvRzVw?= =?utf-8?B?Z2V1NnkvZElGVVNwK0Q5S1Z4ZFZzZWEwbEp0NlY5bldZOU92SzJVTVRyelNv?= =?utf-8?B?d1pqN1kyMVBRcGl6S0xtdnlEMVpDUjg1VUNseHlpanlEN2NDbmVMT2p4V3Iz?= =?utf-8?B?c3M1NFBmTG9nWnZRbk1oRDkvbGp6bDgraE40Q0RLd1RvSjJsQVgvL21HbVcy?= =?utf-8?B?Qmc3dkE1aDg1ZXV6bkVaT3JIU3ZrQzUwY0FXZHJoeHVrQkIza0phekJJQVYx?= =?utf-8?B?TEt0amt0cGxIV2YrT2daRjF1WUl6Ym5uUXZQQWdrdEVmRkRiNlk0L3hrMDNM?= =?utf-8?B?UzhHOTJuV1NNNjNmSVo1d25Cb1pNWkxaa2tRUENCWDM0ajJDbUtRZHNYNnRR?= =?utf-8?B?b2NmdHg5cWs3eGZWRFBKdGFWMFZnVC9La1VEemgzcXM5engwcUoxZVdmckVU?= =?utf-8?B?VmdYMkdRTllJa1ZPZjFpOFF6U0ZWTUhnQmx3T0dsZVdKdmxtc1NnN2paQ2cy?= =?utf-8?B?RXZYZWxsVFpPbk1BanZvVzVMeTJwNEV4cU5mSWdXZVpjSnlROUJGUG5Gcit4?= =?utf-8?B?UEFlT1pzMUpRY0dSelhYMGZhME1rbkRCaGV5UEpTZU5hMkN6cjRmYm9qM2N2?= =?utf-8?B?aTRHVFhldms3RjdhclpGOE9GZVEzWTJLU0NUVVZSbmdtTDdMM0trRVl5WlVB?= =?utf-8?B?UElXQW9KNjBYM293clpKNVlLei92SzlkV2Z2SFVmQnpVbUdmRkZ1V21nTXFL?= =?utf-8?B?VHhhMmowbFhva2w4dk84VlYxNlk0Vmd0aDV3ZE0zRWNDOHNNTEpEd3hXZDNC?= =?utf-8?B?eHptZWRERFh1K1ZnaFdhMytFYnFnT0srTmlPcEw2RU1KU25TcXM0UnluSE92?= =?utf-8?B?SjRYN1dxNW5ybnNlNTMxdWcxczBTVTdHYnpoSXNxMkxoR1BxeTkyT2pYeExW?= =?utf-8?B?S3RwTWlDTURsRmMwWTJvbno2bUJ3aG81bFlzRmNSck1HQzlKSDZvS3A4VE5m?= =?utf-8?B?WjdYeU0xQ2VqNytZOWVuUUNXV3NYWlh6Wjhpcm4xK0J3TlNsZHd1RmhGWnN0?= =?utf-8?B?TEdyUHNhNjZMbU1wdWZHaXFjUktqRnVONmRPYjk4OGF5QkozVWI4RXdXLytI?= =?utf-8?Q?tcopr4alw/U=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)(376014)(1800799024)(366016); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RjVMZVl4d0VMQjY5bjlWZTU3blFXM2pEVnRrbnFoT1l4aER0QzdqcHdrUTZR?= =?utf-8?B?M2lzUWRtRGpvOEtPV0FwZ29mdmJKd2JmcitPblQwUHZsQWYvM3dHQXg5c2RO?= =?utf-8?B?ZEdBNHdNNlpqSlkxSlNwOHpIQUllSnVJK1dWMXNabWE2S0p5WVdjT0hGK1NZ?= =?utf-8?B?NjBpUEZJUzNtemM4NDB3MlBYVU9ZdHltYnhOd2NDRWR4clpHUXkrMm9IanpU?= =?utf-8?B?TDEyTlRTMzBaRmpZSGcwQkk0Q0ZFL1ZzSks0a0VXd3hSN0xCWWJxNlZUREFa?= =?utf-8?B?Qm8wOWN6ODIyZ01GbW16MWJTZ3h2U2hCak92bnQ3V2p5VDJFNm00T05sNzNl?= =?utf-8?B?aGo5Z2VyQ2FhZE9ManhHSGJlTnVid0ZsWlNsUUNzemFvWE1oTDZDOU9kZGdR?= =?utf-8?B?clh3VXVoaUFoS0xvcGRidm96Y2UyUERkUURwSTR0T1VxWjJxU3draG9CMFVj?= =?utf-8?B?dllsYlE4anJVZUVrY2JWZVJtVTNNalQ4cGQ1MUkwRmJaSzRTNUpyc0lWUXd6?= =?utf-8?B?dHNPUytIa3hSb1FLUFkvZjh2eGZtV0RoWUtWUCtpeStLcXgxVHhwVHRCSVJT?= =?utf-8?B?Rk13cC81NDIyVUhxZUVLbm5yK2ZaTHNnaTV0STRVYzZYVWZiOE4xckhscVk0?= =?utf-8?B?VlVkMEtHTE0rKytGSDBaT3FYZHNrWnlyRk4yU0xsYzVpNHNmUm5ZT3grekNo?= =?utf-8?B?UlZnRGcyNG5VOURRM3ROWW4wbW51Zyt0Rll4LzdiU0VhZU5OZnJlUXZWQXVJ?= =?utf-8?B?KzBnanArVW9VMmhMZno2ZkFHbnlXVStYQnR3ZDFPQ09GS05QaWVsOGQxWHlU?= =?utf-8?B?N0xabWF5ZXo3NVIxU0R0OUxQOHllcFhXSDBqYTROUWM5VDBORDZSckFEQUNr?= =?utf-8?B?VXB5SmVpSlkxZWxCMkl1N0pvcHlSM1I4cjJ4eEFSTnUrMlg5N21KSGFWNCtQ?= =?utf-8?B?S1VvbzNSQ3pTVGgzU0VweHlWQXpqN3NsTTJLdXQwdzkvRWJrQ1c2ZDdsbjVG?= =?utf-8?B?ZHJycnJzWkhJWm9mazZYYnRzaUk3SS83S2xNVTFIakpPelkwTWtha0lnOHdC?= =?utf-8?B?SGJmNFV2bm5ESUVnVjJ4NGNMVWp4a2JvWXVsd1J1MTJtdVhpbE42WWp3Nmxy?= =?utf-8?B?WWozQkk2alozVjhJSzVIaGVsckpaTkF5ei9FSlNVUUsvbnhaRWNlVVdFMUhy?= =?utf-8?B?Wm9UbW0wRk5BZTVvRzhMZkk1OFRQU3prOUZ1Vm5USXU5SThKaG5jTVVlbzU3?= =?utf-8?B?ekZadnNpYlhSNVNrYnByTFVRM3NrNTM5a3BJMlRtbEp3RGJrbmR6WFZQUWow?= =?utf-8?B?dEZXM1REOVlPTEwxVGI4L1lJZTlwalJBQU9sUkdCSm5Kc3UxdlZPZWtkUnFj?= =?utf-8?B?dk9jNmVadVJvMnFMRGlNb3NYVi9kUUJqakxJVTZ1UU9PTjVSdGFNTFpzZ2sx?= =?utf-8?B?eHg5YW9mSjZZeXV5blIvMVZITkJJcFJBblVwRGVDZnRRZUVIODlIOVAwSFZk?= =?utf-8?B?dEhZM0RlVjB5Q1QybkcvR3dnVFhaZWRHZWZZVnpXTTlocHg4bVk1TGowRlFM?= =?utf-8?B?VUtRZWZXNVZ4TStWN2VqVy9CbzJMTHdiS21NVVhHZDRNQ24rdnFMRnRYR2tl?= =?utf-8?B?UnZPcFBtOVdMY2dFLzZQSk1aUlpJajFndktwY29OR1JSZ1NPeUFUMjFZVGp6?= =?utf-8?B?Zm9qSkc1ZkQzaksxZWpiVmNhRDMrT3NLZXJUNDVVbkZaRkNMUnhDUTNkL1BG?= =?utf-8?B?SGtFMUoyMVhBOTlaeTlEZzdYZTg3WUp2TDZkVmdYTXAxVUdKTEU3Vy9kVHF6?= =?utf-8?B?dGtwNC81UmhqT2hZSHdmdWVIalExbHg5ZzM1QVdJcmtPT2JWRGE3d2F2RFdS?= =?utf-8?B?SFhMTUplWWszWnhDa0svbGlCeWZ0d2JuMmt2a1M5VWVYRkYzUlY5Ymc4N2l5?= =?utf-8?B?UGNDb3dUZk5UMm51MmRNQW9lZWdzMmh6eFNLWG9FQk1NeHZBM3I0dWY1NThQ?= =?utf-8?B?VkFZbzBRRFR5NWZxRVZXUndBMjh5ek9kaE91aFRrdHhNUXh0SkRJRE80V2ZO?= =?utf-8?B?aS8rZE85QU5Ud1ZpK1dQWTh5ZEdwMEVZV1pkU0VVT1NnRVZOaW5nV0QzTUVB?= =?utf-8?B?dGZyUGNIK2ZWZk9takhHRkN2SEpNL0xUdlF5M0hGU2E3T0lvWTBuQjEwMnhS?= =?utf-8?B?VlE9PQ==?= X-OriginatorOrg: cji.paris X-MS-Exchange-CrossTenant-Network-Message-Id: d9d53186-c3a5-4fe0-0a89-08ddc372a65f X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2025 07:38:56.0165 (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: N6xfIf7nTLudf6NWSSsalfGBQIZtMyAO/ZjPMfo6GKh8UFMPU26LiiQaCafWLWCyYDmaQDa1RuoYO61NpQl3gWRI4rdXk34clEA6a6xjuO4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR0P264MB2645 Subject: Re: [FFmpeg-devel] [PATCH v3 1/2] avcodec/aac_ac3_parser: simplify 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 7/12/25 12:52, Michael Niedermayer wrote: > On Fri, Jul 11, 2025 at 11:54:29AM +0200, Nicolas Gaullier wrote: >> Remove unused USAC/ADTS code: ff_adts_header_parse() parse the >> object_type from a 2 bits field. >> See also 696ea1c2236842572df88d573e24a39be3f19c98. >> >> 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 >> --- >> libavcodec/aac_ac3_parser.c | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c >> index e10ce13a3b..b49ce0277c 100644 >> --- a/libavcodec/aac_ac3_parser.c >> +++ b/libavcodec/aac_ac3_parser.c >> @@ -147,15 +147,14 @@ 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; > Are these 2 changes related ? > if not they are maybe better in 2 seperate patches They are related in that they both are partial revert of the same commit, and they both apply to the same code section (so order matter). I split it into two patches as I think it makes it clearer. Nicolas _______________________________________________ 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".