From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4B322499FE for ; Mon, 26 Feb 2024 01:40:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DCB068C74E; Mon, 26 Feb 2024 03:40:32 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2057.outbound.protection.outlook.com [40.92.90.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 711C368BF02 for ; Mon, 26 Feb 2024 03:40:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QU9JkmJPKJdrdg29FPaUC4E20QpvGsua6HHCg+X//tVOr60McbgQAm+DJFDZG9P1bLNic1tKLzl5+uwYsyVXnuwQ77DSLTN5ekgRVYwMdxIE7+E3rcas5/hx7V4nxTHTF2dI8DEDgx4YM/CmuXsy2/oIPK8PU4Ds26mDzJ1uXb2vwf7gnj2L1rQNn7ZaQpe++q9jf6iKi+dw7fSUmaG2WsCJDJvZ+iLpB/uCnAgWqkQm9BUAP3pytygd4mV1MOoomdRcSbIy0ahRXvsQ2jrKZC8CcGJuq04QmDGl/abQhgz0De2POYMA0fn2xo0G3kFokfr6YyORJVb996WvOXajQw== 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=A4DiR8vAwKD2K/mkAWUxM7DzO6EQyv8psCbvk4yhK2g=; b=irckCb1dcc9IS+nBy2cFUmUn9cu0Q4e0xhrVE7l94/r/1w4x1avCXw7aZvDW43fwr6CZ/JKAzVMnDSCewMOt9k1t74vpMKCB8tXcVQuHRz4jVSqiTRv04D4TNcOw4wDhxs/RO4ylRbSRY8GgUXySJFDPIgwaiC9UhV0QOm7Zbro6ArjAsWoogVVhtwIRYXOVA1gSq0qMbcFJlHeG4XZ/tCm15fpGj9w4HnWQlRS1+RLRNIBtOJ+Dygni53MT5kBbPazEZHasTxE/LNJUcKTk3Q+P1tX25BI55jL0H5xPK3HrnIYYQdUOrTihCZq2bysxwf3LdjBtXcxOCkIMUEGFnw== 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=A4DiR8vAwKD2K/mkAWUxM7DzO6EQyv8psCbvk4yhK2g=; b=niCtNQRZxvRmFhgFrPw6wpfcW4yF0Km6l7fSqUVxYO8J8+2/m6Bg0faPM+CShvd/GCjETwMxRZKO31dRvzOSDrmmbZzAda1/nyIu0Mv8xft3t6ElEB4UB+7qSjXEZBMHXV1gMoHd+/aQy6LBgyKzgkQQu9NgbKeBb496Vl6dZOAwxn39XkM0wLt0V2B+bttww8aiBzM1gYFeqQvgw1O7eRK/6AFt/9L8s6iKq6/51eD6AzGuG4RHU0IJjh+cAR10nqN7RKNYc74FHEgx/02eK/3hT8l31w37dqp3SxeRZSgnAEhWACIBfR86G+pbmMhbcwSjTGQCsVsWxH1AmZivQA== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2024 02:26:55 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [hcuYsblSGq3Ow6Orb+Ml6/3VVssqdkXQ6N9mOfg8rrs=] 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-6-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: f2adfb1a-1191-41f6-9d31-08dc3669c70d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NAZ2kk3Ut/zP5b1irrAV/ukGIncSlxWTkTTtR/a9DQD14vZAVM5mbjMYlsvsppSvI3jrdpiHPUc6yc4KItMIab+7VBLJnv6R/uMAwvtVeRrMjH/raT6JoI7JY7nBv3CZXkx9Ra3IDYKSuFlsNX39PMTUtPqZ+qvq6KgDaL6UXozAAsekhuUIKHiXXZBHFjcAOpn+bcEpo99p/bOof18iZHQn5vOsP32Hp12W/A3wkJeSBE9r89jndrwqyWr5pHCMocR14ZAEU42en+bh+1C9pJnBYPxW+iMMJ6+N73uFOotFoynnre6pJ69C7gkceTIjy/sClcFTckAvC4b42k9G3Y5UEhErtTCJSeqPbPZsDviWz5RFeGkqeFP8UHKPt4M0A7AhL6K8c0tbfMPfBSvWXWLtf0jhDcRfhphEleCq2dl5BL5E9c6f6JTTVzdTJ7zSndASIKFeKtUDnCROrZv5y4mkRDttjiSmz/g9jF3RJYuj4VcgsWK+uJ+9++H16KqaYrvc7pn38wDH+MT+cA2xdl4yDvbc8qJBxZFHJy6FaAYKJWgu7ikwONqDBxi46zLEzy6C4lpWym07Uahbmy/s18+E+EiVhKiwKehpmvQFydUmDWm0jnoWnzml/e0sYJW4RwXziQm/PhcgoMZxRpHuDS6zRaKtigtotoOvH7tHmv1a5ilyYN0sdoDlb2z7ct6gGIadWVguRudS7MOcyFejag== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?elR6/eUCryV2FG1rna6eslFAsbCkktfVe8T5XfHWKmFuxLsdNQRrR4ghzBhl?= =?us-ascii?Q?GvYNr4OYRZIWPovmYpZzn9SRAMkDWGZbaAN1iZHvt/LehMTH+EHYLHYyPyL8?= =?us-ascii?Q?DMlXEsKKshBkTtC/xAtxR/ONLr6Xe1esJ1G47DGbMcFvr25YBZekyYjrOlkW?= =?us-ascii?Q?vwbV17OaJH9ym7STbLMhZepleuQm+3LCG1zYw93Vm8Tf4tIxbyS++Qk5p8z8?= =?us-ascii?Q?3rOmVGU0JDzSEiNmB4ybeDOJ+y1N9+ILdukHZFEEro23lowM5TYn4eRO59eP?= =?us-ascii?Q?XllwdtYmnjcq/j23L03XF+zZU3j8HQZmKOpaUW15GhOSDBfpeCZgxdnmoYCt?= =?us-ascii?Q?5k0LEL1jDSTY3II7SpycRU8TLwIq7YvuSA8ab1b28gueGa7cQEerAWFAr/IM?= =?us-ascii?Q?ZxFOHhMlzsF5Qjw5O/n3K8K/dfrwE6j3X71VYVadQbF9dfz7W3RIloNcPASe?= =?us-ascii?Q?1WP4I/JpJiNKMnmU+WUzZXd9ybyg1IltfHnXnhmuX3oHiweHBulwS9B0d83s?= =?us-ascii?Q?m9ztu7SLAi5C+ulzGOXgbSfQqx4Xlx24GQu+Qv7HkaE1cPMJXfBL6bmiQDy0?= =?us-ascii?Q?H5B8CKpgLO+vTmSDn4uO+t1hBxFrJwErUdrMw2SMkW0skJmeFWVdL+5mscPh?= =?us-ascii?Q?9331bEamTeBekyX2EG4+BuD2FV3ji09CjRARbRUN8UV6dRm+n6k/13Eklo6z?= =?us-ascii?Q?9AAdMbkNgyN5Y5f9bfE/rwPCGqbnN9nSNeEctwXp4O84ga5j8ccL3heDg4V8?= =?us-ascii?Q?ouee4lxUH2/FbqPTXG2lGf6q+3z4bqSkLOE7X2tNk+dexrMCjBHXrSx6NXfB?= =?us-ascii?Q?3n0ReE6tkx91TNtXjBZLn4l3n5bBfB+plBSmZLGV7/eDY3uNufDHCAJko9D9?= =?us-ascii?Q?4fx9XNUwnABOccYRneLTIRzVOgnLEOjU9ztPo8d130aaYCbYc6TULPg78f4M?= =?us-ascii?Q?gBA+eh4NCvukq7ORQj6S6FVcqcqw9sOhRVCuXIBaU7NhoGO3JM3aXcG1NyxA?= =?us-ascii?Q?To5tJX8zZq1TFsgohYqdA5QwNCHKZnR3H0Z9OOr/hvQHHbqJf+JynXeWatGM?= =?us-ascii?Q?JsUK5ABEjYeXydan10tOF0mYHWI7udjC0OgBdpDizge9euSINoZLwRDREdyB?= =?us-ascii?Q?clXfBfFftggBbw+fFmZh/arnyhkudOsx7xG5P9ZUpGaQC0xs/Vb6JArXiqGh?= =?us-ascii?Q?XEinRxToQcBI38IrI7JDXBxH1lZk3QXf92j+aLhCfZkIG+ZmVjpdse5NgvaA?= =?us-ascii?Q?HPwVJ/tWmzDT59jATKeOygWJ0TDyinfsOdPSUfIUQg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2adfb1a-1191-41f6-9d31-08dc3669c70d 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:12.0387 (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 7/8] avcodec/sbr: Remove unused AACDecContext* parameter from sbr_lf_gen_mips 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 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/aacsbr.h | 2 ++ libavcodec/aacsbr_template.c | 4 ++-- libavcodec/mips/aacsbr_mips.c | 2 +- libavcodec/sbr.h | 4 +--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index ad4935d734..cb680cc548 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -36,6 +36,8 @@ #define ENVELOPE_ADJUSTMENT_OFFSET 2 #define NOISE_FLOOR_OFFSET 6 +struct AACDecContext; + /** * SBR VLC tables */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index 72bec96d2c..6a5b471e7a 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1244,7 +1244,7 @@ static void sbr_qmf_synthesis(AVTXContext *mdct, av_tx_fn mdct_fn, #endif /// Generate the subband filtered lowband -static int sbr_lf_gen(AACDecContext *ac, SpectralBandReplication *sbr, +static int sbr_lf_gen(SpectralBandReplication *sbr, INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2], int buf_idx) { @@ -1494,7 +1494,7 @@ void AAC_RENAME(ff_sbr_apply)(AACDecContext *ac, SpectralBandReplication *sbr, i ch ? R : L, sbr->data[ch].analysis_filterbank_samples, (INTFLOAT*)sbr->qmf_filter_scratch, sbr->data[ch].W, sbr->data[ch].Ypos); - sbr->c.sbr_lf_gen(ac, sbr, sbr->X_low, + sbr->c.sbr_lf_gen(sbr, sbr->X_low, (const INTFLOAT (*)[32][32][2]) sbr->data[ch].W, sbr->data[ch].Ypos); sbr->data[ch].Ypos ^= 1; diff --git a/libavcodec/mips/aacsbr_mips.c b/libavcodec/mips/aacsbr_mips.c index 0dc09130b7..e0715491e6 100644 --- a/libavcodec/mips/aacsbr_mips.c +++ b/libavcodec/mips/aacsbr_mips.c @@ -60,7 +60,7 @@ #if HAVE_INLINE_ASM #if HAVE_MIPSFPU -static int sbr_lf_gen_mips(AACDecContext *ac, SpectralBandReplication *sbr, +static int sbr_lf_gen_mips(SpectralBandReplication *sbr, float X_low[32][40][2], const float W[2][32][32][2], int buf_idx) { diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index 46c68615c8..fe3a39603a 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -37,8 +37,6 @@ #include "aacps.h" #include "sbrdsp.h" -struct AACDecContext; - /** * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. */ @@ -121,7 +119,7 @@ typedef struct SpectralBandReplication SpectralBandReplication; * aacsbr functions pointers */ typedef struct AACSBRContext { - int (*sbr_lf_gen)(struct AACDecContext *ac, SpectralBandReplication *sbr, + int (*sbr_lf_gen)(SpectralBandReplication *sbr, INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2], int buf_idx); void (*sbr_hf_assemble)(INTFLOAT Y1[38][64][2], -- 2.40.1 _______________________________________________ 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".