From patchwork Tue Sep 26 22:17:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2210714pzh; Tue, 26 Sep 2023 15:22:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIfi05UimXV+TzICP/DKCJvJi5swbMc4+5EPBKO26l/fya4Smiv/mDDmLmtk0v95XrexEL X-Received: by 2002:a05:6512:3193:b0:503:26ab:9ac9 with SMTP id i19-20020a056512319300b0050326ab9ac9mr85719lfe.48.1695766934157; Tue, 26 Sep 2023 15:22:14 -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 x17-20020aa7d391000000b0052a1d5b92d0si11954560edq.647.2023.09.26.15.22.13; Tue, 26 Sep 2023 15:22:14 -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=eWoQEyGP; 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 B973968CB56; Wed, 27 Sep 2023 01:20:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED86268CAE7 for ; Wed, 27 Sep 2023 01:20:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QeoKS/YmxYmqWTr+4NF0tWy5y4ayiL5j6jmxZ+/Vg61vLypV+sZiczBYkQ+sIBeTH6XJ7IUT5Jb1IfI7v7SIq3heFHkZmyTDcOCe1PB4gsXR15eo8efS71y+7a5NcR7QdXZ2KwbYHht6QVUJO6w46Xc6Q72Lpceq/uuSUZkeVpr/G9L/WpI8zWcBIphvXWrWis+DPyfsgotyIipqAamOWuLyjwpFhwfxKPVaSWEOYyVO/2gJ7VQ9sn0HNs7CbjwZ2EMF3DgYPWGLaujMTX+U/NQj4rJQxjdaqm8u1EAPXSEKpo3xAEreYuqxNUJNVwg66rmyINALG5OtV/N0IagmqQ== 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=oawpyiQPUZ1bEKYga+5JL+o12EMnnZs2T9vmcB30hhk=; b=ifRbsnE5/zwyKnKzszfF8103ao7MSSVmUzRReuG4vwIQOiMwoEYhux+AoSQRFN31EslVzyP0lfu7dTVc7FXFu6fkoQvrfftjAYZOg26HPvvtetb//UoOkGH5N0yGVgrCKQf8GjvRu6JGCsDa6hCRGhP4cwmxGcYZu86421nNiTT0B3AoU0iOYdbTLqIrtgVmICaIqmm9Nh8Uw0H2gmEv6akL71Ipqrilx/jslxX8SJQVgFMpEwwl16x7jOFhyX9ZK9HkFbXYcCkvrvJU2KPCS56PH27dMOWmexpbIRwaZe1PMvxXFUY5dr5nmid7kebIpAWgvUaq82avP21l3LGbtQ== 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=oawpyiQPUZ1bEKYga+5JL+o12EMnnZs2T9vmcB30hhk=; b=eWoQEyGPBYgTiokN/0Ax1Hk4qWta8IpcXsrD+x/VZHEwtOYzbSxRKWA4ayUqTaT9TE8jjkuYFXilFJk9YDfE0y2xiMKygjL/rLrkXU3Cnx7BSIXYcRJyWxljf1fM1qL+0BV3Qq5YyB6JJXCWbkQrWuAgBhXbpsZtRAOcLMbiepHFvaRBhzMGx+NYy+kbBPQU+mKcWK7Ay9PE7bzLZpy8nZW2HbqjUeAYgggUSw74i0b1IbkIZ7zA7LCMN+6Rf7SWVQXgrQOaYQOIv8DPrFn9zY7bB/+UgQd+aHNoAnw1bvqK2XsXB6seNjIvlsibfJTAb/oQL3KZVv8A5giVPy55xQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0393.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 22:20:17 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 22:20:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:17:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Amd9mm+epC6yJoJ8qqBjNJK+/3I3pPaC] X-ClientProxiedBy: FR3P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230926221732.3711507-39-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0393:EE_ X-MS-Office365-Filtering-Correlation-Id: 1933e732-0de1-446d-2248-08dbbedec334 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VnIhehrBZwyeTSRSKTVrITlQU5WAaI357pzhiP1JAsVrcpDQa2cJXEpkDoCDXYVqz6TmMTSDbBKp884BZc0lecUlwpoiT46nre2RlKpRqiefcSYPDhDSJBNIpX8TDJJk3Y8O+l8VPf6p9oxqt+MBg58gyWVYdcbzD46PTYY1l03d6H32nKBWfhqrV5yVSXYZejfW2n9W0IqlBchDDKVU28++wa1Izoq+d7L+OQSaMHu6JUnsNRiOSzCnRdyvQ27uTVPnRaoNsmtFiwk6J3AQxAPSZGM/ZtZuWk1s/5mBUMxqtHsd12VfRfv4X6KlgmZRsqVruU61phBp78/g2U8rgEVfKj0flIO5VOFKGIADsPxxwu61dYMJmuonCZXLQkAozkiDlrq/rDCNB4ZxC0aYM4IMqnK2vSOdDDKmV/RdUR8X9wsrvznO7pjXfk9sHUYQ7OUDp+JBMv2Jtw5jZ0H6kHXCx30fzAJG/w01poiFXlM+c5WnZ+LsWcw0s4GKVHxLyKkd4y3TLXkUMu+flEeoFQg+PWlfb+A98zQkvaxT62/cBDusOuBwZrXm6jDQb14qleWRU650s3eDDii8X+2CyoX5imHTJUPu2W/LjnUhcc1bH30O++QbYTm84hYeZ5zd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G7Q01V9uDcVbSFZhYIY7SBiz1W49YAXL0OELrQzwCdXs952tWA2tJyA5g8igTSMkrySKbYw+2QpkFsp30EpdadBUAigHGjUcgYPzgWb48KPm4huqxV8eTbkCMFcb3gtn7p1cqZwH2E5WwHj6nFR4fEJ68Qo8QwgWb2jquQSl8TcEOukkhQmeedkBx5JrTjk9JZABfgPOE2FvxEq4Q0rNI032Zp8s9b0yMpleRIHMa/GWxMsf3MuXZENcPhOpFVJ1OoKniiZ5obJLYhiUYPDMKFTf+4xcQA4n1mc+AacF1HfOYJDKgT2VBJIV1mzQG/VuoV3HN4ONiatZi5oNFEXk/Gv2E6hKmuDnIJN/dRuTDD8pSoJZM7AHZL8+z4sK9HMqj4ZoIE1xNdQGkLwuFWcEwIWQ3hcIWRMAIQ+KOYvDt41bj0ifogEiw0LOkB5w7z+pHfjbHJd/1+jzZXJqv/6goc1rgkyuDODiQ9PoxI1K0umspsu23ph0issfKwitUFeP2T4RsaHrobYbZz9hVA+nfNtJsob2FoUrLuX1/O2egnkYp/4oZRNrJR11z/oT3nBD+VhtjBP0tu//XHDFW15j66zsd+Rf1PKqt+gx410Kd0T1Fc0AzgMDOG3bRmzOG2g5qqUQ2meb7WxXqm13Btx+yKRXCTBWm/rXUnpt2f1EC/rR+gPoVhXFu9vpSg0zpJRHP1hMGAC7c5OFT18FyY40f/Q5GU4ZW/Jjvu1tbSM6dYKMlHqh7eTPsvaUGbpLZ7aJOSIggMmCdIY8Bi3RoZyeWVwvide4057j9X2rTZgClgs+CEKEjTLs6RnQHPaqcafCvk+yU09Hpr5oEFczxbPvESw91xJcZMu8UAujp1sh4RWolluPPMSRnlCrIjOjHGe/vs1g8HsXtgtmVBeFPGoVN/yv+OcemW4NXxJEiO/LY3ODQkBRTPb2b7/CoF32KKTfBvPPUQ7EBGn/Xbf47qdbYnLDw4R2JKbbUhAbTpPP9hP+wQVS28sJKRaxSsVuk3oCFbWPnGaqPtZs18sJDPIj3RU2Ts4sZsa7QVD31x0Bwl20yiBELbEfJ20V3GduaetpEqKxvJqJokkrS6sj1Ba9AzrUilqOldt7pVVznk5cQBRfPVvBfxn9BjTDdC5aDnmvX4YCK2lQwjEZk4sqxcpXcPr+rt5zwZzc+G7YbYYQkp2a9V1Pe9Mhtzd92mg2YeCJdi/8ZVXx4rhO6sOnYDKCSb6ljnQN+P1xZ/V6XasUZ89Nnss9LWrOrMav8WQT0AmO X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1933e732-0de1-446d-2248-08dbbedec334 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 22:20:17.2451 (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: AS8P250MB0393 Subject: [FFmpeg-devel] [PATCH 40/61] avcodec/aacps: Remove unused AVCodecContext* parameter from ff_ps_apply 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: j/APY6oAWdh8 Signed-off-by: Andreas Rheinhardt --- libavcodec/aacps.c | 3 +-- libavcodec/aacps.h | 2 +- libavcodec/aacsbr_template.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c index 655e8fe5b4..ed00006a3a 100644 --- a/libavcodec/aacps.c +++ b/libavcodec/aacps.c @@ -26,7 +26,6 @@ #include "libavutil/common.h" #include "libavutil/mathematics.h" #include "libavutil/mem_internal.h" -#include "avcodec.h" #include "aacps.h" #if USE_FIXED #include "aacps_fixed_tablegen.h" @@ -717,7 +716,7 @@ static void stereo_processing(PSContext *ps, INTFLOAT (*l)[32][2], INTFLOAT (*r) } } -int AAC_RENAME(ff_ps_apply)(AVCodecContext *avctx, PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top) +int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top) { INTFLOAT (*Lbuf)[32][2] = ps->Lbuf; INTFLOAT (*Rbuf)[32][2] = ps->Rbuf; diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h index 3efa38ad88..9d7e79c2b2 100644 --- a/libavcodec/aacps.h +++ b/libavcodec/aacps.h @@ -97,6 +97,6 @@ void AAC_RENAME(ff_ps_init)(void); void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps); int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb, PSCommonContext *ps, int bits_left); -int AAC_RENAME(ff_ps_apply)(AVCodecContext *avctx, PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top); +int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top); #endif /* AVCODEC_AACPS_H */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index b33ffd4295..f3d3258d2e 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1569,7 +1569,7 @@ void AAC_RENAME(ff_sbr_apply)(AACContext *ac, SpectralBandReplication *sbr, int if (ac->oc[1].m4ac.ps == 1) { if (sbr->ps.common.start) { - AAC_RENAME(ff_ps_apply)(ac->avctx, &sbr->ps, sbr->X[0], sbr->X[1], sbr->kx[1] + sbr->m[1]); + AAC_RENAME(ff_ps_apply)(&sbr->ps, sbr->X[0], sbr->X[1], sbr->kx[1] + sbr->m[1]); } else { memcpy(sbr->X[1], sbr->X[0], sizeof(sbr->X[0])); }