From patchwork Fri May 10 16:56:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp718472pzb; Fri, 10 May 2024 09:57:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRQpAr349KvdWzrD6DpmpTfrokvUnwnU4YHGlbeWZ14cfVZE+unrdwKXZGK9T61RKC2dfV9/CLYrV6jB3FPKHDsZF4WSzqm/p1rQ== X-Google-Smtp-Source: AGHT+IEabc8LiaC5ukMmcrm9nMcV6MDkbVHRpDgP5paNfU4QLgKPd6fF3WT/pzKxNHmBU05XvrKT X-Received: by 2002:a05:6512:34ca:b0:51f:51d9:942b with SMTP id 2adb3069b0e04-52210277c40mr2491130e87.60.1715360232924; Fri, 10 May 2024 09:57:12 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17ba2ad7si226129166b.553.2024.05.10.09.57.05; Fri, 10 May 2024 09:57:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=mQf6Gquc; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1995C68D5AF; Fri, 10 May 2024 19:56:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04A1968D59A for ; Fri, 10 May 2024 19:56:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ihukCBpdO8uQLzPY6gD6hJZIVO+JShrlC25XM6G6tg/VHvUjF5RrYR+uCeWlkWWv53XsbyoDyZ9oLdgWe9u0kzO0lko4gpWi+lb22H21FwDSkWmvaW2bZTaCcRdDJeaxjHdsZB0e7/UBLLyntBuuxj3LeIrh8w8zZeB1VRGhDVH7feN8/PhHzW0kYmjGWFY6JGenmvJHG76vTwZ50vALSuDIkWWNkO7avcdqpfOE2CJ3q52hVcAkxwBtvcZ2DRH24DF8X6wfzi1/+85CyFJZiC2DSFSUgRQ7W9bbm3Kjf2PQerchGEYWffVlEGdpsrqS0t+cEP8QThvrd8Hd23AwIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=DrK+RKME5SWFe8z4XpW89Dqj5RDCIpy21rvqAnhcf8Q=; b=cA8csApuBTJiUcmc6mFqRU8RF7owQwERso6Vc3kJsAHFTzdnSgVljcsvQ22G1sbaoMq5D1GGx5FwabO9Nv1Bjf4GllJfUibUAUcJDny1ZcvRQrv3PsVZSkGeqxFWKRPU4ovcRdqwhAboIGhoEUkx3DgUEGa+Sld787VYeO+zmzTqZTrmaZQI1ZnQlGb3fQj64CFjWWBdBkLLwCdMOhTDmkutwMNnbLDZq4YbhVuXEipZikbqRPRAnLrrZk0iQYtU8gwfTKR58VjVRQXF3EC53FSfA+Lw/v2LKoOh6BDv1h6JV97O0BwFw9lwdTzxeSSLW0ANzVFhnbczbVpofl6pew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DrK+RKME5SWFe8z4XpW89Dqj5RDCIpy21rvqAnhcf8Q=; b=mQf6GqucT/zEfaQnNgd2ZGIVsofXHVZB3BTg2SBzyUShrLsrjo7OdDAXIKGdzhdvl4efohrxlxjwMwBuQ43R7jrhOFRFJyxKwXVOfhDIKpO/6l63hzhVJtUhXC4ZrmGtKdHRt1b91AnB+l5wigI/qSadiNqeg2ljiMj1vM4ajzsjJwYTFExixcuk9FLHICOdq3maX5KFelbh26lw33uQD3E0ILyEu389aQ5jtjmw0Vux/8qi1AQPKB+JPb8o6pVg7KbJNs02HrAe1fT23WqzdD7eG9WQWNAj4zR5O6cKtsBgyEX3j56XJzBfsy6z4HguCW+9QkTyuyhGTNoiwpNQeg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0283.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 16:56:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.048; Fri, 10 May 2024 16:56:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 18:56:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [NDQPaAiWKL6Hw6idKxd8Q3wsXgE0UUN0lh8f2nFf6UQ=] X-ClientProxiedBy: ZR0P278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::25) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240510165627.507659-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0283:EE_ X-MS-Office365-Filtering-Correlation-Id: 20be4839-e1f1-43c2-eac4-08dc71122c44 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: NB4Nsb4K3gRVmoNjNkIdrB2N37nPlVzPsAViIWR4RNDqJD1Lzvi7PTNg4fGkIQ28oQhMCqmUlueA0bxowaqWy14eOGZ1O0ZZ8UpGrKriUoCFV7kKzfzS9ETXDr0hmmByav0FwkgNvqo0xlX48kR/I9R5+3r5x1HxsjBU8mFCwbGX58nHsnBC6HjYNLUnzQ2+qOCbSgjQRLlyPgNKBrjhFvKiYRjYEzC+VO6AQFujZShcdMI4ArnKVn0T53UvMsChEfvVaT3yKQ5wvafwQe/9E1SvoPTGMfgZx1lDlLer2AMQyCVmodCaoLyWWbMtJNl1QicDzTeYxqXAMuxs2a7pO0e2Cc86kyS1jUwjGyRh/JsSamtX+ieDZ6BhUb/LGlIPThl/AhAZlflHyILSi/YqXaw9NxTa8txxlk4HFytXBqcxuNBocrp3DEg7jPUJSsnLNNbtKKsHSikqsXa2P3YNm1P8Nm49peD1RKm6lIiLkrBZgziSZepsdpdMM0zH9mt1Hss/dWXYAVuELcuPG60dPm3SzjQotBLDczQ0IsoRgDehP+Q58/ywp6K/mFhlZ3n+cJu9OzOTvCvEKfGTRR+OLPdzBF6cAC076i8KXX7muokcrY6TIvHbMHvgKWBGcoQf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MuF1JZ3BhNMa5euD5YmwMAMOx99O7EevTXLY2tsFcIBzI9vsakqVDCpS2hWigX2TCzt9bvKciFu3TxrnPc4UQ1/08PDyFCri/TWrHUVVxoIakjvdDZMqBvCDxVbEUBSCUSWj8ZuU3VNoZwB37YW66Epvj4vs1o+yQyrKHp9r96x2llhXe8a76Z0t4SoKR502ILTV5fBFTQl3Q7+Gmn/7Z5iQpchV20qXXQSsXg7EcQw3gBPSa1V8QQ+6ANFWqW3l8nQakuQeeLUmyl/urdiymjjVJN22Qp9DydxrTytWrNq+avZrSu3+DGc/V6zzWbN7W6EMBfG3yXYaUzm0i911JnHtmNbpPw4l+k4wG4XiffVTVfqJwAOoPxLdIEz3C3sJDrT8OeioR2+T1vK6eK9h/TMSUHveKfTjp/eONppV7qZV6NVHFhQDY39cFzH0e2ntdljRuvluNfVWIaEyHjz+G0/j/1nrXMBM22N7ik7gbsRyesx8/iYVWNwS6BCca75sxWtWkR3z45NXg/EEbt1jcw7N0Ycc9vvO5DIO20CEbBtbqKBovhPmq4xfSNTtR/jJBmzCo4ICsWrNZO7Wgjfq5KVz2fP832eh24dBwBQmVJDmCMOTXI/x86TUAJH6KAsE2mNWLnLFvpMIvibkW+j8n7c99zrpq3yh7MX76gKiO+f8vsk8/V5AdklQCfEoVyNCuc9H2167TxTw6xayD2t3GI2dCT0zEgXdUkmAMV78Lvd3ERoQbSB3d0e9AiPH7xcONMHHyIZZMFWzf+RU6uFzhU91Ejae8CVOZHpA9ZbR0RKdR4rXW79VI3m9SCT+ULYKju2h0atD8gvkoTsjpk7C0gGqYdciZO6xpecDLHXejTPxq5dwizsxoiKlWD4grYe0EbJPV+CDj2DsQFRnqusbIEqBYMwKw2ASCwLJdyZShtmT5U8KVszo8qsz6Xbgsnr9Cgn+WLiP8LH6brEFmigSy0r42B7zefcHLl3ryoe48U3TIWKEWxyhFduZhJMDOZG8ST4HqKVcVP/QFx8n+iIJtfHdNmxxcKrYzAhvlNygICwi1EpGFl5ucGmSUe6JzLo/z1Lg+idH8GPAQF97Hxa/d53dh36P2MCdrkOsNdqblHxFUXABBNXn0R5e177DRnVo8bm3ENbaWUh8eD1Qb7R5LfirFK9MomnzRkp9k8LCl4GPesEFJ3vR7L1QeExSI12WnyvVYai/EzjIu3vSWX6UHT56aUJnmkI24atAV07kTv9yBQplIKhQyzYEOD7+z2GJNPhX/MJqttyjEnph6D7BYQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20be4839-e1f1-43c2-eac4-08dc71122c44 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 16:56:44.8296 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0283 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/aac_ac3_parser: Use ff_adts_header_parse_buf() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: W0gJPwiw6isN instead of avpriv_adts_header_parse(). Using the former avoids an indirection. Signed-off-by: Andreas Rheinhardt --- 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 9305b4c50f..f45631d09f 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -144,10 +144,9 @@ get_next: #endif } else { #if CONFIG_AAC_PARSER - AACADTSHeaderInfo hdr, *phrd = &hdr; - int ret = avpriv_adts_header_parse(&phrd, buf, buf_size); - - if (ret < 0) + AACADTSHeaderInfo hdr; + if (buf_size < AV_AAC_ADTS_HEADER_SIZE || + ff_adts_header_parse_buf(buf, &hdr) < 0) return i; bit_rate = hdr.bit_rate;