From patchwork Mon Feb 26 01:26:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46537 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1115554pzb; Sun, 25 Feb 2024 17:40:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX7ryuKazFEBP24a2Syk9q5JMbzB4WxPAMKHSRtRBVDjs4oUHWfxDXH7lun7Z9xKwfb6tTc4j2hIgymd8zv8dyKShc6E27+hlWGtQ== X-Google-Smtp-Source: AGHT+IHEbr9ml9BcksXMhOLfvpwqkSz5AECRsdb3k/DNwkEbBtoJmnB6dKk4szhF7bSB44ypPQbx X-Received: by 2002:a2e:b819:0:b0:2d2:231d:8521 with SMTP id u25-20020a2eb819000000b002d2231d8521mr2934917ljo.15.1708911645290; Sun, 25 Feb 2024 17:40:45 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w11-20020a056402128b00b00565402c6bf1si1639523edv.208.2024.02.25.17.40.44; Sun, 25 Feb 2024 17:40:45 -0800 (PST) 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=kVbPhyJI; 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 AFA0068C7DA; Mon, 26 Feb 2024 03:40:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2077.outbound.protection.outlook.com [40.92.90.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F68568C778 for ; Mon, 26 Feb 2024 03:40:32 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SFzJaWdWTV2VJhHUFAklU76UurrAQwZnfq0W2czEYNb6R1xQESHNpHPWBajvHPnUlabxajmBLGrWcGUdRUmHnswjraY7X+E3ORzlwpy/Znj4N82Rpv2SnRPUbqhXkV6GF2WsBOAKkmGecz2JM29mLuMky0r3v6+hP1eBjmOuaY8/67N03Nt0u4gH+DMLgcz5FtH51GYuNkFfcVHJIv1CUdElNqtp1MZZBV+oRBrxoEYT6UVIm3PpWdSwD+TibtnwShnkkfplw3ApplDVkfX3hNBlwXjZUjWQ2fPnDYLxKHofzCd2bDlVf+RxyYNgan0PPL1rv9SiYRxrDQWOgYOMJw== 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=lknDCSOu7/cuXt8s61BzWRCdot1pnjpGuAI1qkXORf4=; b=eGwveo3FrbxSekIIM0P99fTCCLMpu4zLJvYCamSubFy/k7CKcXkWmw0fBirje5JFqv2ADvQ9cx6Tm2YPY2W2Ca8CxMyv5iqvmTGytRuSX2Fm0LFLm/qrpmHRq5iX7KttFnANITsd1tKubh7ksKHzH+gFgUzxTof4aNnYE2FgxkFoBXZs0DnQQCgL73TD2QQwOyZHqfIRUuUvDYCzA6uKue4GFHMI+gZnpSg36RXf75DN8mtIVfHdxyCW0zNnzBlxZhiLSV2wD3G2pcPTqANqtfONLa+Y1rwVA2QvJc7Rcf58SW+2bKptVMZtR1Wyrlf/AfU8ouhFbfud5pQ924S5+A== 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=lknDCSOu7/cuXt8s61BzWRCdot1pnjpGuAI1qkXORf4=; b=kVbPhyJIvZG0CfKom9Nw67HxdxLvQ2KqENuCqIzDXZMbDieu77MuVfR5pnoacEAt+4Vmn7LxzSVp61/KydpzWTCZIgNgGtY0yX/xpGOxYZclu5/G17kKDU6ly/PkSnh1xzb9bosPt+HfhvcwcVIOFt91p8yCb/qxoGHTPivLO/q4ZIZ0096PpeosDh0bVYiz9R1BkzuCnLJVCHg60+OvNyMjPvl1k+/fWTDh8wxJHRoEcjVNAUyor0CBr01IGexjUiin4G4YxSWU4fJ6xE4d0n5CN8PzOgYHd2VvzNAXQ0tefkbh8x593YI8bAACaKIxTbFxJgFjtR7SBmY96cLY4A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0288.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 01:25:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Mon, 26 Feb 2024 01:25:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2024 02:26:51 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ecCZVujUWFSk/j+MFE0QpuERAyrqGsN6xolGuRn2VkA=] X-ClientProxiedBy: ZR0P278CA0063.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240226012656.4055642-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0288:EE_ X-MS-Office365-Filtering-Correlation-Id: a7a7ab96-e265-42d3-e7e6-08dc3669c391 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eAGE8KLb68kN+oOOdNAaoQ0kv0GY5TKVUG1Ui2Q0hHWS96dhP5yz27zzfyA45SN/JaGn0Zn+vnCkkMIj1wbly2N6LYOQpyzTp62eB2R+/vptMINoYWF1++1g9VnbQEZwLTNYvOD8COqPzifvOwkrMkoD50DSXLPNKQQPxHWuglN5yJJO+rjC7I6gLaLSa9tM8dv5jEnNaVS7EvaTs6BWRp7Pey+blsguXL71oGlXszeMNA49xeMUMGE3iaTnFCHKlzgq9dzPam3ax5oNM4tYjfCqapzJ0GZTjbGeNX91jcIR99bLmTAweWJqjfkNewnrpL6Hp4e8vtR9Dj+pJXKsGsCGu3FbFOIIfdCJiCEfOqn6rYj3WjeG9FcGdz/3YhZC9ebSLevKTXHgDaE77Jv3p57soTrDfpST91bIh/HuUXB0YX/qJ9qlSUPCkg1J9/jsyCTP+WtoiQDGGM8IV+df3LnHU+ZTUN8KMqpwqTpSelyl0lASfn74YT3OUOr6ISMIUxCrtzzMzyHWvxyKyWcODpvAZKf1pxJfmHC/JnZA5nBmUk3KqFL5y98PFufvtLosRvBqM14P0ThAv/xW24yCgqG12lUR0qGEeWyau4qPq9E8uGvtrojgjUkgRrHd8YO3wHByJQU/5wEfqfZhLP6uORg7oZtX43m4xsA9alhyCJjFpSSQ5XuHwDcV+UEEidSo3Yak6XIRY7jLwHxMmnnLBA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pEaABv3vClUlh50oB5NMD5CZTdnANbsqilnbvW7Xj8hIjeYabS/K3ToAAsZjqQvO7HsQdeBbbBnqufzuF2vCFr+2o2H7sokw8XsChUpM6U/cG5f+At7Hd4anAY62dWY8KDUvn9np74M4ggo2tGqAmYqP71HudYlcvANgqAd1unSv5EicebBBkI5NiJRLkCAfreii7nnG/GsIiiBqagyskqtmVBCeFBIw+om7rKvdkP8a9i5NSHCqaV+kTJTMtTN6TQJqX98NJqr/XrAvxc5MTc9Zdh6qLsqrQHPVqeJso39qPrGRo7ogRvHd2FUFPmNm1z0nnD3+B1CI5NGqzDVSM9sP7o4dBIGr4BBVsAuH8vQcd+meVh4G2gKWPbMXNPqcOYHUwQ+1YP2Gec8XvM59hK5gViacbFcJXi3qCwhNw0jXwLOhbFIQgZYCEZ5+ucroezltVSE1jglpDJyP0adoooSmgj2hDeePWLKa0VEJfeCXi8LlECvBufjPi1KK6Xr09Jr/zzqQS4CP/+l82jnMXEZGyMi070nC1loPAhW56G7Qs77Zqk/xoxHUFJQ9DGIRov8DGra8zi5aW5SZaopdtmxZ7NNXE0VKGQdpbqUqyzp7c360QZrYPBpcp4iByD3uJ3bFVpu6n9rnsu7Cbuib8GGrWjNEkQlgZ3Nw0nm0yC2JnWWNbzFl/pZLFHr1LW4FfvtfDcP7AhlVUI3of7RnKPZGgwHqI+BhCRqCxrmxr4VvLTYWYbmXWfzrgYEI6wrY5d2MpwkMvRXUUEgxrWVadoEPt6s5y3P7Gt871D2m0U5wH+TSoPcyuhIgpk+X17QoMq2ZQbL7rI156Wh/pafNoyBpvN0IBsLns+sFzUQHCKhdRqFP5isqAdUgKxDZfr4qLXxm1jcyx5tchC6l9XeWw7ZBIMrEjyCROscuUCWkpgevcxqUgrScBnwySlm0GAaWVpTMBlOJSvdj0+NiqhJpmlqcWp5oK9lXOsr03OI51hZp0PHjIKAWCqheG3tboTcG6dBm5t1BX7aKwn8pVNXDrYEcriomGJZcZgWnY5wvhAFBdSoHcWpLUqlwP289Pq6NVoBOXtIj/O1cBuScN2VwDyaRmnFfSVQnJ8zTz4xdkhvQFxGvRx4Py0BfaHD8it8xcoYjZ9lZG0GhnqUK7yXOlLo5sbJXxpSMPHDY2hEkjZ1qCjoHcWZjYUTQQK8FowMQWIg4ntmuwLCbEsfc3wuDVZmquuvb2aM7OlI1oMRKn4zp86Qi5Nqfr5fMTru8GGjeQmpQvubXTzQ92cxuC3vGMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7a7ab96-e265-42d3-e7e6-08dc3669c391 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 01:25:06.1859 (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: DU2P250MB0288 Subject: [FFmpeg-devel] [PATCH 3/8] avcodec/aacsbr: Remove unused parameter from sbr_gain_calc 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: 5jHnhJKt1QTW Signed-off-by: Andreas Rheinhardt --- libavcodec/aacsbr.c | 2 +- libavcodec/aacsbr_fixed.c | 2 +- libavcodec/aacsbr_template.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index da9e160a57..aafc00049a 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -233,7 +233,7 @@ static void sbr_chirp(SpectralBandReplication *sbr, SBRData *ch_data) * Calculation of levels of additional HF signal components (14496-3 sp04 p219) * and Calculation of gain (14496-3 sp04 p219) */ -static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr, +static void sbr_gain_calc(SpectralBandReplication *sbr, SBRData *ch_data, const int e_a[2]) { int e, k, m; diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c index 3dbda32447..06d07e1941 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aacsbr_fixed.c @@ -394,7 +394,7 @@ static void sbr_chirp(SpectralBandReplication *sbr, SBRData *ch_data) * Calculation of levels of additional HF signal components (14496-3 sp04 p219) * and Calculation of gain (14496-3 sp04 p219) */ -static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr, +static void sbr_gain_calc(SpectralBandReplication *sbr, SBRData *ch_data, const int e_a[2]) { int e, k, m; diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index ba8e3495b4..e0725b6363 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1513,7 +1513,7 @@ void AAC_RENAME(ff_sbr_apply)(AACContext *ac, SpectralBandReplication *sbr, int err = sbr_mapping(ac, sbr, &sbr->data[ch], sbr->data[ch].e_a); if (!err) { sbr_env_estimate(sbr->e_curr, sbr->X_high, sbr, &sbr->data[ch]); - sbr_gain_calc(ac, sbr, &sbr->data[ch], sbr->data[ch].e_a); + sbr_gain_calc(sbr, &sbr->data[ch], sbr->data[ch].e_a); sbr->c.sbr_hf_assemble(sbr->data[ch].Y[sbr->data[ch].Ypos], (const INTFLOAT (*)[40][2]) sbr->X_high, sbr, &sbr->data[ch],