From patchwork Mon May 6 12:14: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: 48578 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp1334709pzb; Mon, 6 May 2024 05:15:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU9o5mn6RQfCrtGIitMpkedeZPyt30tQaKQOUlm3fBMZ1AMAbxs61U5usSjfJnHpnvxB6/p904i8Ym6XbXwGZj6LAwUG1JqhY1VKQ== X-Google-Smtp-Source: AGHT+IFVxAQgX5yJAzcbq2aEaIDUo6ylapZ6m9WnIu4dNMTr40Gn83ypnFQxudATLa1LH4VHzKAP X-Received: by 2002:ac2:58fb:0:b0:51f:1bf8:610e with SMTP id v27-20020ac258fb000000b0051f1bf8610emr5698035lfo.37.1714997716768; Mon, 06 May 2024 05:15:16 -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 ca5-20020aa7cd65000000b00572d25c4509si3852084edb.257.2024.05.06.05.15.16; Mon, 06 May 2024 05:15:16 -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=rPu8JgZV; 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 4EAF368D5F2; Mon, 6 May 2024 15:15:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2079.outbound.protection.outlook.com [40.92.64.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96D8468D53B for ; Mon, 6 May 2024 15:15:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VV4gycGrvAi3ko57vfACkyfiXcR8KEMN6ghCwB8doFyYto45xtJXf3bq6ui72TnePj745zYxSJcXPWoYz8eMjulZmyxvYoF6RJ6OUMSM1k4l0SNtlP1AuC9voNsaY+w6mxjr+j+zHNMbXXe0UFN4FsDjDo+BQgIwvHCn4XoJJStl/7NWRp7wI41buqCP1lzATi8PKO6K4eAHJZ/zuPoehEmbktYXlbpAG4z1HEDnVZ16m4cr3E2l35Dcjkhv/Zwl/sQAb7zLVd/k7dEB7cPL+9AVph8g29iyN93Km98h8t18k9+ZOvqbf1OhstaycnKwmk+fVcM4ZN22Xpv5jZ/yWw== 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=YY2Xp3gw4bT+owf82e8qs8LPJGpdYyzvLJsf1SmdVB0=; b=WYix4mzegdytRbhjnWkvxqo4Mh1IYGSB/YVjqyUvf+v8v1ZyQQHe9ZVjp8txF06jOnM/Kb2Td8OGTvP1O0w/kmrvEaTsoNz0CLqsrUtHvt0fsrK8fWnKxYuUfyQE2oGjb5mHWWraZilL8isTBNr1fQfc156d8KC4wLctSHsOgaO/FLdqo8UBD4Udl97i3E0nJOuvuZJavM9dRXC83bPzZ8GFfINtx7sE9ikp5qrJUTP4cMS4XC/6S7/JopvCz9I8VYjQk6peG8hcNuANasNhJz3btm9h8JyTmL9C8eQR8udFlMqI6ktuV+Wl6J85kGs42UVcw0zrQS3cMcP+oIFrnQ== 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=YY2Xp3gw4bT+owf82e8qs8LPJGpdYyzvLJsf1SmdVB0=; b=rPu8JgZVUxNEQccAuqG4PsT7tS6WIIWbdS0rM61h1baQZyU4CtdwMiOzmccE4UW3O4u73cIH45QqG2JFDuXAhNE2Oj8ISL6Blirj8Z9TTKE0KNieI5T7Hb92HaeHcJNRu3x1VWegwH8CZE85gj1kn98gCmZOsXEJb2DnAILzyDdpioUzj0Em1qaUIWyfUqPmH7FNXOc1SQ8CL1eXbuox/jAjoGScVJwISappMS6aI3aQVftqjMbcj+4jI2eLNuDeMQAR4bwSTaYjveA/byJaroBa4MSuvkZ57y2wMH7m9oo3eFtxD0Vt4JnpOwRHWQpa90kAdGVCp24PsaWwTjsI1Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0194.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:179::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Mon, 6 May 2024 12:15:04 +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.029; Mon, 6 May 2024 12:15:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 14:14:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [jregvd3mJREBfFjh2Ou4lWAyxjQAeE1b8lQtuxWMn7M=] X-ClientProxiedBy: ZR2P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240506121434.225228-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0194:EE_ X-MS-Office365-Filtering-Correlation-Id: 07312b50-9efe-4d67-4f64-08dc6dc6291e X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: wnCMQgT9AEitObnnD8ahCFibcp/Du22STH+8w05U5EDYAnkVVVhOLQJ5ixurUkw1HD2MaokYm2CKpW6YfpSamB1WsiSGYipltqDCtkEAYnmZqLXHpBLPK05OPkRwPlaidjptTL2UHB+HR2v4TX7E54p57nH8ZPhnrm2IZ2/AlhWK/DroZ3g1a0rzaUEdNZhmtZvx+WmlTeaCo7NQQib4EkLen4x2BK6EI0cN+ANWTW22IlW+UYu2pnvcA48PIJEjCo0HaunzwiiYPnzmegVl2qX7NwTyuwHnwm1N814S3utXuiKksN/DjpWozskuPA0X3HlMqmPSP6yRLbfDa3a4xEA+3gO1iRKt0DYTlyvZHh6eck45e/ESssiJ7AvhN/BUwaJyPLlgqYrBXMb02ZjcRG0hDvV9LwhBTcCJUg3HjjM2b2a5SN/GBjSAAvLNgFjObaSE8sK4AIine+oTSMXE7mpbqrouPGWsSUh+kFsAfBImXNAuNCIou9AxTRQ45AaoPwVF5J+cp335tFIl5RpngtgM9QJay1JmvlAzis4uEOC37dURsqrSlzGxZR/bgEPO5FxE0dmTrC6QbJgr/EkJUVKOP1p9rGotnHtGO36TQLZwylaWC/7gpsKq1u0Du92n X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mlRLO3iWA00fW4RCtfyfRFED7FTgP5ZyPmniM9zXizB3ADnOyxMNsFxgxFacVXF8+dmwHIgEpVoSsC4+te6mv1XQkqaQF0ooT+2RYbcTXvQLntsV9d5E3/yfQ1PN9oCq1tz0lPqy5V5BeYUNo5v4GiUg4sdPRN/f8tVf+rr+ScItOvpHDsv8V1io2nZXfYkwOlCR2Y1e6becQ3dtyfwaB+RNeFdoIhrlzKlYtwKhH7xJQ+ifGVhn2Inw3uFOH6kAI0rNdNx1QkA1pxm6x5i/YUhf7kM3e4wU6z2cY4+4mUuO7mFfNDD1ewvaI7xMUW4e1sfYNq0rwDfyy9jZGztmVuWpItqmZ3EkSN4BJhr6yp9QPC9GhTA26oLTHpLKANE2WWb4LU3b/h2NAgM/PIjIERoavj+IuHyOx7Vy+Fwz0bqj182KhXf0uaMEeTs9ED0RZ76whtZEqHRxBNfsEgvxi5LsNM6t8vLjc/vqJhqkajyufGEmFnlN4IzCqdHr7WdYwKzx5B5i/XgmH2NcPxPcCOwcPWXKlgjU65FmE/u4k9wQHGWrgZ4Uqj9iIG6P5rgFsL6llmFVBD3aih0RRf6iA4JYG9Qh664jbRw320bhGz56lT3LBlgqLYdxiLj2z3CPMi7JtZwdkxloYEFEr+EH+nCFr/sesj5bE21SrzU/+ecnUiRAqRACVC/PlOr+bHsMvcXJ840Z7PFMlHRYZoRTDFPQmD4gTF3EvKgaydZWrV8it1ClEkCw0lKoAQR/Tif6/OuffIbIxvc3iExxeZsK5mhQdYixBXDXSudIkwVbbgISCIPcODs2WUkVrNyW51VgL3ZDgFnqJIRVsze4SfE0cYtMj1i4gGeEP/4IU0szlbn1zycpYLAwBWJ7WgRS9+EaWMPbxEucD4cD2V+JzdC9FrQNrYQYh1lm6esJzMnqLWUrnzBBQ2cK9wL6F7+j8pf5FFVRms8gi2kJUNyD68V178vG/GOhD3cJP29zpYI0ZYsgAi0Z8WRk0pZAUQzUI6BIp5OUHjieFCxbuFiN+1ymwPbaz8YJjS//8BsbgS3IR2HMKAJm+Uf2LQKW/djpaeMcLLhD7Gmfczifrz58VyiLgEz6MhmAiJHtoGIE0pGuNFEeQ7vbT++KmO61bYICpFp5NBTImndFpfTcPGk3Oy6jKtOkl1yjXBWwKZX2fgwSQ277iSG0EX1rekIXG8FB91DEIl6k6qKsnj5wQtf8kBnzKtpm39HFEuuNpL5CDhpy+j0wZ8zvrpdvdhqN0qf6Mj2cwPTYMAXmM9kQgQ3ey5YUlg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07312b50-9efe-4d67-4f64-08dc6dc6291e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 12:15:04.2321 (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: PR3P250MB0194 Subject: [FFmpeg-devel] [PATCH 05/12] avcodec/aac/aacdec: Move channel number check out of init_dsp() 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: NEotoHEbMKa5 Also move initializing random_state. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac/aacdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index f6a7266123..a78a669602 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -1159,13 +1159,6 @@ static av_cold int init_dsp(AVCodecContext *avctx) const float *const scalep = is_fixed ? &scale_fixed : &scale_float; enum AVTXType tx_type = is_fixed ? AV_TX_INT32_MDCT : AV_TX_FLOAT_MDCT; - if (avctx->ch_layout.nb_channels > MAX_CHANNELS) { - av_log(avctx, AV_LOG_ERROR, "Too many channels\n"); - return AVERROR_INVALIDDATA; - } - - ac->random_state = 0x1f2e3d4c; - #define MDCT_INIT(s, fn, len, sval) \ scale_fixed = (sval) * 128.0f; \ scale_float = (sval) / 32768.0f; \ @@ -1248,6 +1241,13 @@ static av_cold int aac_decode_init_internal(AVCodecContext *avctx) } } + if (avctx->ch_layout.nb_channels > MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels\n"); + return AVERROR_INVALIDDATA; + } + + ac->random_state = 0x1f2e3d4c; + return init_dsp(avctx); }