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 69F6850306 for ; Fri, 11 Jul 2025 09:55:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 6F6C668FE73; Fri, 11 Jul 2025 12:54:57 +0300 (EEST) Received: from PA5P264CU001.outbound.protection.outlook.com (mail-francecentralazon11020086.outbound.protection.outlook.com [52.101.167.86]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id ADFD368EBD3 for ; Fri, 11 Jul 2025 12:54:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IwYSxp3+9J3n+Ps7DB1z4Ht5OUq5LEBVGR27D7I2hAd8o84dEx2Xde2VaDhor+K2echR/uiDMp8ETIYSBiWQ/72/z3vxgVaEnkJJ2UX8zY0pBVJJL/e5UD485YpHTO8pKdmxV0lnkFEojdBz6Zo2NL2FrUrVnpyYcMHPUjF8m4PBJWlGJnQv7Qt/YE2Kl1BqmECl781IohxASsyjCKp76nznbpem4RaDGQB7LsiTlQU+p4PyYF7H8fDvcFvyD19nWf8NwSmGZvk4Bu7tf2u8jF9j6oBeDtvBkf0GJck5dc74QZ38ddJprF6YT/GT+bhiBbBUa3aRZKuV5lCS5YMLdw== 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=XQE1sqbV4c1z5NAtHCy1D5zxN98g9ojXzGmrUl4cjx4=; b=cF++NFyYXKnTbHOoVMlcC5bQtA3FX+4pj+ezkZgh2J38/NNPDZChdOycqC7LIBrJASicZv7MoTZreSwo8NgjuwiXExMtus91XJAaRqXNYlK1R5eKLKed2waub8I+5VZNwNjm2RXAKrCWEGNApflN0Xd6H0ytHkJe+n+RKHX9XRNzds+SRvQYxK0X/OpekNGr2rDt+jTlhip0rPSbQMCuzBztdbFgzfKhT/FarF0rLsBnblPqya611N70BophMJNZbzWlXMD54w5W6k1OsC88VvZty5XWyswPVpoLMG2ACjEZMAMP8Q+TnVPkKoZLsE8DPOGlmQGXJNFJXBSaKi/BPg== 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=XQE1sqbV4c1z5NAtHCy1D5zxN98g9ojXzGmrUl4cjx4=; b=BzF09uLxUBIfmwg/Fvz457RodE+Lk3tUxMQSXOiUbgbRRY7YmPM+AD/iMnq1E76RIpsYOxVKPYTTAE+RIcyP3bbpqX8OIPl6hCCTl7XpzSJWWQTMRh3jirMzICKTKCsB9TuDN+4nEB1QTU2kK9+lIKKLpsEKubCB+lK7XKGKUQXyMDm4+ArlhJFZDgSpB6TmFaCaVUIu+Rf/+pEymZKIrt17ZopgJlk5ch6CIUei9sZe61V/lRZ79BuKjZPsHWtqsR7eOMsGQyvHwOp8mHP2ae/bEXkbOcGIuQA1AQ0D1kNipBUz2Ccq5Q5P/w66A4QhswE0fn1Xe9iWjSy8s5AgHQ== 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 PARP264MB6011.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:4a9::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.25; Fri, 11 Jul 2025 09:54:45 +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.023; Fri, 11 Jul 2025 09:54:44 +0000 From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jul 2025 11:54:29 +0200 Message-ID: <20250711095439.332634-2-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250711095439.332634-1-nicolas.gaullier@cji.paris> References: <20250711095439.332634-1-nicolas.gaullier@cji.paris> X-ClientProxiedBy: PA7P264CA0081.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:349::6) To MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MR1P264MB2483:EE_|PARP264MB6011:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ae90d14-3217-46b0-1cab-08ddc060f6c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mIApVehjbJLbFUR4v1cwgzQvOy/rIHIcRV7+CqXhS2NOoP1ggzapxvL+x4G2?= =?us-ascii?Q?33MuwLj+D1O45L3ML8IzuxGtcqW7pdEXefUy8lDY5FDLggDyMsTWbUa7w4m/?= =?us-ascii?Q?8yEI4Z/qC98x8yV9Cfks2G4UtNn7rzN+URqoP9HnbcWAUefoB2YG0dCuuivZ?= =?us-ascii?Q?asuTmtfl7VoaKE/1TaZHngz/SF+KHpEE10HG1rc18TL65CQ1OHOqd0uitqOV?= =?us-ascii?Q?dFQcVhH7l6jCjYVQoFkhxV9SRww3BW9zlJyRqNqBfIrkexiBxF5RfBdCASg5?= =?us-ascii?Q?Kt8ij114RuFwTBlQMRC6F0FvDmOzYchk5V6b3iLaiahuAkSQ4pYTvankSfNc?= =?us-ascii?Q?h+dkbk5+IrDo0DmdjEc8PG33fLDYLoz6KvCKgIBEKGNqv4S7qoQnh6Ll33Cg?= =?us-ascii?Q?NZ87K4XA9Sw3O9OfeCH+B66F6OSq820aarogSmIaWL4HPEJrW7rEozXoapWr?= =?us-ascii?Q?HHYzu/Ud7FjvY/8y7c6L9fx3Ltq+ikmBXaiaqqhaqAMXg1o6jA8jaVp03y8e?= =?us-ascii?Q?xufFwoYSe50fJ+3taZ+4nY85Kq+24aGgPHCfo0APtmsG9pmm3xiQVtTi3Xf0?= =?us-ascii?Q?EvcTO23RqMzhR+h3/t0yQZ2ijIm01EOg7+neqBr28tHLG3y0KchV99Tl9Ow1?= =?us-ascii?Q?iDiyaMxnhTNny3901DDL685S0ItBcGHFH4N3Fn07P7PSNKK/jgT4thJ8cx2Z?= =?us-ascii?Q?XNGpkPz/EzFky/AOKe8cpSv3QU5NdMshwye8NFQ02eSZz4HbpUPCUdUSWtNx?= =?us-ascii?Q?CY8DCICqcpQROhPzyKTfCvEz6dcl6T/HtoB6sPgVyBZwDi0qGt2SV7yoM0cl?= =?us-ascii?Q?ZBBbdtVixBAkFCQZBrXSfH2UtqIr1EZ/k2h6pcEnOhRgDYe32m5nqMQJEJim?= =?us-ascii?Q?VL0Rch3q1IdIYGLam4RxQc/wtNnCWk/eqVXQLb3slVxDTU3x/C0zb15v/3yW?= =?us-ascii?Q?680Pybtw5nQDUJhHvU8k4y0eahomINSMOZh6NR7njA5Xu9sRLUH7fW0Zod2q?= =?us-ascii?Q?szAImUwsQl9k0d1t7Vjq5/aENrkxrkfup9nZaNTX13VR3tVM1RvqZA+ZSU6v?= =?us-ascii?Q?5xd/wnponAO6McqMJ5m27ik6nLcybrxlXiidW8ZQ1lKwkxEdx/qP1Ze4Fh4s?= =?us-ascii?Q?giR1mAO0ewZA55C7VYH6ePkLw8R6J29X+xgsbf/M239Hr945OsFIRE6rGcVY?= =?us-ascii?Q?1zTFjzdvtf7MZaE9duI3usx6q0MymsB+Y8GO5pgtuACKCj+NEz4/DyyI9tci?= =?us-ascii?Q?Vh9u4UjRC9gsrid2aquRrPkkixKf1qpYcMBxzj3PxBdzVT2BnkBejjOVXXzz?= =?us-ascii?Q?10G/Fnp5oRDQJVS4cyjoq/EiKh5ZtVDWM4eETizftixzjHlMz5HSpsFdecGY?= =?us-ascii?Q?/0usgMAGfZ+qM69Ohv5g/UyQyqsccPAYQRUXln4sNMAMK5rC1lJZ5aWJ5fxt?= =?us-ascii?Q?+e5gWLEHreA=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)(366016)(376014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nRihqP15jeL8yylI6O6eg25p/g6C0SC/Sn4Z6NRDmn4BqwnQC0+MDgvzIu9Q?= =?us-ascii?Q?WqcqAvVRLkrzwKvayJ1ksrCz/jk7HFjgeb6kYXGUjHZp5vCmlzwB+fmVuA0a?= =?us-ascii?Q?otoPHd0uA3G5V66VO0wVTA0o4jomcCxRfGV6/6TaWqLQF6NKdIdsHO0basST?= =?us-ascii?Q?d4CO1e0ysOMKITiDl6ZYf8VcXI/l1JGuYOSHZDQkICz2xdtpJPwJ0nvAjXOl?= =?us-ascii?Q?ekRej8t1AtfTVYxXObnWd3WFsQcZlnbcv8ALJfHv6xVYOsJjGyN/WnAewnK4?= =?us-ascii?Q?Z+nCd0d9GoDPWyCujJ/mM7dOtGfW1E12j1p3rOTUmgZKwZ0gDsoChh9GrJk7?= =?us-ascii?Q?gsyukpUFrFHDpmHKImXSuz+Nv1int3vCnEDMiHT6x/rLqnQsI4nxSHUeIar6?= =?us-ascii?Q?G5mvOZfzrxWajHQs/oUHVDcqchL/bASdqHFgNk7XaVKhiO5KcnGCUN0zxFdl?= =?us-ascii?Q?P2CdBFkF4uN0405KZd0SWPUTZODySdCRgh3IBoaTVxT40FcxD4g3JhncNLeY?= =?us-ascii?Q?dgEpkBrjJNTV4l9M0Q2Xg0xbLjG4rDbvMILe5sIYJXGr36LhCZIlfwzLAtUR?= =?us-ascii?Q?AYvmhwfPkYhG29up+2KT564nTMTUSsnJpsABfeN1zP5Xto0JWP/CUxVDAlQJ?= =?us-ascii?Q?9KuQ+4uBdHs7lazojnZ8wWOLS7mrG3uPS2wZ9J+0nt1k++Kf9r2DiOcAlqRP?= =?us-ascii?Q?fINqFOiJZo6BSNdqI0xF8sihXrB7cSDgcuHpSOXS53F5tDUpmp3QEPO4EUem?= =?us-ascii?Q?M4AnA1KsCiEp3bkfStTpdyFyOXEtqTBUtzDuD6Gn0fpaYYaDgE2FBYus0/cP?= =?us-ascii?Q?wd59uv5X660uWgdzpP3SMYzt8dtvH0wbmQHoykpGIm3peyZsN4GYktin6s8W?= =?us-ascii?Q?b2caDUIclpYW5lnY+6DtAXtZ5RNapkw+wnjtcffphbHqnRidR1Bwk0e7+gmF?= =?us-ascii?Q?m5cb5yFwGAsZ48qbiHxLdaxjT9Oz5nH5doklmOjt2/TzIj9qpS4/22iTQXBg?= =?us-ascii?Q?vYQBFpxdmjh5TG0O8QH+U9VFlHYhOPgPJfPME+F7/R2T5rAAOyZZnteKT0l7?= =?us-ascii?Q?guFaUMDvyH+aPZtOwL2WhWGiijlDozDBpnWwzBQa0P8i+dTyMIBFdcMLTWjh?= =?us-ascii?Q?I2DEz73btsihl8QcJVKYooHUTTlpyepm8l35p57a3shsUqBf2uprVEa5VYDb?= =?us-ascii?Q?1wuvmXER/kuqfBq7EPsc2QCxrab8FmnupJ1W43Rohdll0mbTi4dGIE//VEmy?= =?us-ascii?Q?UuBzlp2k5v8RAsIx9MjUV316X/ffkQucqcktM4bmhsxhtfIyaPoqducRZpUl?= =?us-ascii?Q?H3cdULIIi6/Kqn/7EneZr/jGFuWIzhvwVVyCp6nJsrz6RotLj7ApTVtzWii2?= =?us-ascii?Q?YnwsjxuYcP2OTL36dKzr2cuYH4ga45tuzIruLHDXvfVZBfURaIdRqQ11L898?= =?us-ascii?Q?KaJFjAMqAaLMASqx9580t0mAFjHnXOmdY8V/3GAQ9lGivJFsmGdn8qAdUXdo?= =?us-ascii?Q?GmkO0Mr/ogXoYSZ/xbbS9h660P98pLKP4yNo4zZOh/nCoiEeT+8PN13MrHb7?= =?us-ascii?Q?JYIETVK5z6PNSBt41eU6knOEa9G1lOQmStGGjA35O6aeJWd/lsXqJlcn575+?= =?us-ascii?Q?Ig=3D=3D?= X-OriginatorOrg: cji.paris X-MS-Exchange-CrossTenant-Network-Message-Id: 2ae90d14-3217-46b0-1cab-08ddc060f6c7 X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 09:54:44.7608 (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: 6D0yeFYzv5Y+MPkKgNaHIe7dSu+I4BxysmTnQEO3MPigjThAR6IENpEvFKsfND4M3r5jzldf89VlL44ymTuxPWTBL7BJEc0qpjTRiJiSb7Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PARP264MB6011 Subject: [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 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: 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; #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".