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 5F89F47FCC for ; Mon, 6 May 2024 12:16:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFE8868D630; Mon, 6 May 2024 15:15:28 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2013.outbound.protection.outlook.com [40.92.89.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39D1168D53B for ; Mon, 6 May 2024 15:15:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lQy/ysnX45xF8BXL9geT4ulyP/njCT6PzxtYdWPOw7i8+wrRM6rpbjbRzWXvTYisRywMj7tC2ADhkR3HZVahal0V0DsbcVSfA5WOjuoNrQA4GPL7Q6CrQf+p1Uj+kPs2f/V9C6GsAHGwBXmpAXNS+2IupRlQ/A9teuYqOQNHucYZDFooblfukAhVl/7/QfPw70v/XPF9Xb96eMB2/Uz31OdM4koIZY+TepALSBFN4Q6xd9MZKdc7EgZsSOLzNMXTQI/nuHsFv5ztIUz0LjwnZ08CMn8AEQIj2or3nXeUKAWSMv3iZK8N+2/cAxoG3GfIkuVSkbGje58zOu7L0tAjvg== 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=8ISiiZIE27+ppjZxle5SDY4qcN/i5cKRzMJ+jUvr7Rw=; b=Ic0q8LVfUZsebKMjId55aC3lrtLChjmtGK7DQuaEAO640yCn0BoLLZdC6KIrWJyf+nWXZLB9pHSK50sWit3VQotH+//QDnN2pULDc+i43DTzw2z6D09JIBzjS2q26oJJRxRxzAjFKOeI5cSaiVHuH4BB7LKk0jtjnoXbAwR9mC9E/tQdVdmZnlRAWCIzP2EPjARTGvbOIeBXeUBXvTWoB5SapSgAZb6vJDxIzAgL5CG8ggJeo3fcxi3Or95x8zvvj6MoiqgpYFDJr39nC4EErZuR62gx9lZrab5BSrx3I/CQgh6PJHumURtogj6EdyNyG/K72nd+OMwsEtcvyKodYw== 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=8ISiiZIE27+ppjZxle5SDY4qcN/i5cKRzMJ+jUvr7Rw=; b=jbxpBGKG0kr1nJfFgFu1oqM/PxUBuSU8DoEf7M6yiLQRS55eNKZ8f1QVmT2KCkHaYzxcs9cc8W2G6ueALOdIws1Yx+iMEjBTVR4IVGNdytiOsjcAhD5mCLjTBA3eEU+n8lQl2hHfppVQz9Uba3dByeRhpeg0uGCEjl05disGjlxQe8SrF2ohbPrrW8A9D4Ln/emkMyJUQ06rhU6zH1I76gTB8ZWsGrQk1dl/NdTD6sxtScbzDo4zLMOO7TdIWVAKZhtSgO6mvhZR8sog3DEoPO57pG4tUNrzZiFAl0YFZEsJtDES5P60xZiUL5ixXZQollKtrrSH4Ea5hIIFAo8Y3w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0497.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.39; Mon, 6 May 2024 12:15:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 14:14:34 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [jlNhSEJX5PPfQT1nJ8/St01VJmfpRz5H9vF+PZT6Cfk=] 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-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0497:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ce793db-805b-4588-5f63-08dc6dc63472 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: rJKrwFAHYPIwIYqbOF+mtzTl3au+l779NNVfKc8/Toc1tp7I/YFUeZTfbCKPAwkqrw4gnr9diuWFlUaDrTl0WMXTKkymcFKfWsqKm3yTo21WEinrxO1fGtXxZRPuchy5gNjM//656OzJmkomA28LUpa3zCeJzbBqDNycNh7CRNCSII6DprFsEkawok8w2BcbBSoiCKad/N2Vj7jYfnJ8yw//Im/wUJk+gBE4qPQ7wrhDhVQKkGEK854FvVqLbkLsTbpG+nIuCYfq9/rGHR8otmwNXb6+M/bwvZbirvMZv8LHmiGSEUl4iXnABZMRoAACGmOKQB9qbHZ7lQJQrCTzZ04nkB/HEechgeQiceNc9gXfGM2J8ohtm+TFQHLW5/95Ecgs2iFak/ecGpT/X+lgo3FVMr+WWDrGV4HlfP/0yCHLJoWEHPKRnizSbgRK7iz/Kx0BpCPVwUYd3FRBsTVi3qH6vZQts1KzKnORmP0lqGsbHD1aTVwPNK0mp2ca1mBzd0cSavCicSIEUi0FY7nUZCYhGHJ8vP46TUmYXBjXrQLGMaWGKVSy2HM0/n0BsCnOTHdvYx7QJ6GkveS3IKASq251BZ9ipDE0x0kUk4A6tcSONZOTTozh2yLuCnD6id9i X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/ND9sREoFIx7N/DTXAjVlbHaU8xw76w3A2P2hG8CvmYzosKyW8GrDAfbos6A?= =?us-ascii?Q?OUJJ/r6HsUDICDBKkM2qse2o1YuGhpksoG3pNJNMLUAsfXS+1Q39Nl/QEST1?= =?us-ascii?Q?7hIq/n1EtjMHhB7NmuxoV+30KIB40HPwKidepuNUI5ID3x6v2r9MTTKa5Ct8?= =?us-ascii?Q?xfVG6HXNg5lraDcWbAOj+6XWC8gLl1A4xLvYFGT+eqvITbVcl5LxyEcI/6RQ?= =?us-ascii?Q?STDeC5QnUF1/n9szKbilbpLfVZTYOnh++lo6zwqrqNUSRDSsLsAjwebWiaCF?= =?us-ascii?Q?IIKdelA3/ywzPRKPUHs9CFwfMeTL75IJ5QmnjAnp62z7OZX5hYhRY/3ygrcd?= =?us-ascii?Q?Vt+E0zXOkS7PR5HVb/WaS+Gcam4a7vGFaJSUr3KDP5ckGBnM/Ezk++lLYFSj?= =?us-ascii?Q?rlN2+YwH2/va4rxOATJW4V3rkgT1rNF8RhYCUAjIPKfouk3bAHU8BX1FWVcf?= =?us-ascii?Q?7Fshy7F1rc0t6hxF5TLJ+hqoeTOitDJRC6RuQH3hf8jCNR9A0kD5gW3a8Ko/?= =?us-ascii?Q?9ZOuh0fzXF+NoPXHd2AJzkZtkZ+LsYCGLOQVP/3NXOKIHwCMQmHQ0OLNjawd?= =?us-ascii?Q?Vk6d6XkMewms0I+cJyU9oAJVBLEJ/aoGViFMbv12OtQo2y6q2DDHWB/uia5z?= =?us-ascii?Q?TqRnhR/Xup1GkW0iu1Bvm/9mYIWjR2A1ivhOPje2a4nYMIVmUNhbt6Y3qHdu?= =?us-ascii?Q?poBlm1ojuVjlhd3D0fhtwN3i1hoDI8EJqGkE+0go4Y7s0wsk9lyb0kdn2gti?= =?us-ascii?Q?xylXmTmHfRzqNYMXs2NR/hMSBuEZGgGmyQvRk2ZYrr9qYLOdcgb0Uig7NhdU?= =?us-ascii?Q?A/o41HvDDUD54ofe23wPCpx9aBYo+OI58d+O19SS3U0YzTvjVbYDJlePP//B?= =?us-ascii?Q?CHgv7UZq7lyCu/j5+ea9nediP6pVmPoqGR5xyQrixUsIMosMlraOFUJP5bH+?= =?us-ascii?Q?D5kgWaPvCCRHShZ09F8ut8ntl3d3hvEtw4AJY85ep8YmFnklzrKfSwgaM2Qr?= =?us-ascii?Q?xP5EwWNexuUAYtIFUjVpRufHcTZnFW/o4DEuaK3Zm0n3dzdsVU7stSinp1km?= =?us-ascii?Q?6LC8so7D5a69Pow0AfvZniuw5G7wjWoAz3vyLnCAFogrEd1RqlAfV808nQQO?= =?us-ascii?Q?n+N32I0TQOka9WIPmGcfMb6XkVVT4t4Bcl8uMqXp2mID6QBTVtuWeV0PTsUy?= =?us-ascii?Q?xJCaPDzDhDRB0CcNDrcu4nU32U8DTPS0Zv+L9166iMsj7N4Ow5xTU3LTvx91?= =?us-ascii?Q?SFGO+aHTAR30g+bHdAGSdmjzKS8UjeIuOeSJhNk+SQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ce793db-805b-4588-5f63-08dc6dc63472 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:23.2712 (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: DB9P250MB0497 Subject: [FFmpeg-devel] [PATCH 12/12] avcodec/aac/aacdec_(fixed|float): Set AACDecDSP, AACDecProc directly 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: This is more in line with how we initialize DSP functions and avoids tables of function pointers as well as relocations for these. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac/aacdec_dsp_template.c | 43 ++++++++++++++------------- libavcodec/aac/aacdec_fixed.c | 4 +-- libavcodec/aac/aacdec_float.c | 4 +-- libavcodec/aac/aacdec_proc_template.c | 11 ++++--- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/libavcodec/aac/aacdec_dsp_template.c b/libavcodec/aac/aacdec_dsp_template.c index 70f0a3cce6..621baef8ca 100644 --- a/libavcodec/aac/aacdec_dsp_template.c +++ b/libavcodec/aac/aacdec_dsp_template.c @@ -615,23 +615,26 @@ static void AAC_RENAME(apply_prediction)(AACDecContext *ac, SingleChannelElement reset_all_predictors(sce->AAC_RENAME(predictor_state)); } -static const AACDecDSP AAC_RENAME(aac_dsp) = { - .dequant_scalefactors = &AAC_RENAME(dequant_scalefactors), - .apply_mid_side_stereo = &AAC_RENAME(apply_mid_side_stereo), - .apply_intensity_stereo = &AAC_RENAME(apply_intensity_stereo), - .apply_tns = &AAC_RENAME(apply_tns), - .apply_ltp = &AAC_RENAME(apply_ltp), - .update_ltp = &AAC_RENAME(update_ltp), - - .apply_prediction = AAC_RENAME(apply_prediction), - - .imdct_and_windowing = AAC_RENAME(imdct_and_windowing), - .imdct_and_windowing_960 = AAC_RENAME(imdct_and_windowing_960), - .imdct_and_windowing_ld = AAC_RENAME(imdct_and_windowing_ld), - .imdct_and_windowing_eld = AAC_RENAME(imdct_and_windowing_eld), - - .apply_dependent_coupling = AAC_RENAME(apply_dependent_coupling), - .apply_independent_coupling = AAC_RENAME(apply_independent_coupling), - - .clip_output = AAC_RENAME(clip_output), -}; +static av_cold void AAC_RENAME(aac_dsp_init)(AACDecDSP *aac_dsp) +{ +#define SET(member) aac_dsp->member = AAC_RENAME(member) + SET(dequant_scalefactors); + SET(apply_mid_side_stereo); + SET(apply_intensity_stereo); + SET(apply_tns); + SET(apply_ltp); + SET(update_ltp); + + SET(apply_prediction); + + SET(imdct_and_windowing); + SET(imdct_and_windowing_960); + SET(imdct_and_windowing_ld); + SET(imdct_and_windowing_eld); + + SET(apply_dependent_coupling); + SET(apply_independent_coupling); + + SET(clip_output); +#undef SET +} diff --git a/libavcodec/aac/aacdec_fixed.c b/libavcodec/aac/aacdec_fixed.c index 79d35e05fb..de90880884 100644 --- a/libavcodec/aac/aacdec_fixed.c +++ b/libavcodec/aac/aacdec_fixed.c @@ -90,8 +90,8 @@ av_cold int ff_aac_decode_init_fixed(AVCodecContext *avctx) ac->is_fixed = 1; avctx->sample_fmt = AV_SAMPLE_FMT_S32P; - ac->dsp = aac_dsp_fixed; - ac->proc = aac_proc_fixed; + aac_dsp_init_fixed(&ac->dsp); + aac_proc_init_fixed(&ac->proc); ac->fdsp = avpriv_alloc_fixed_dsp(avctx->flags & AV_CODEC_FLAG_BITEXACT); if (!ac->fdsp) diff --git a/libavcodec/aac/aacdec_float.c b/libavcodec/aac/aacdec_float.c index d48a21eef2..885d824fa7 100644 --- a/libavcodec/aac/aacdec_float.c +++ b/libavcodec/aac/aacdec_float.c @@ -160,8 +160,8 @@ av_cold int ff_aac_decode_init_float(AVCodecContext *avctx) ac->is_fixed = 0; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; - ac->dsp = aac_dsp; - ac->proc = aac_proc; + aac_dsp_init(&ac->dsp); + aac_proc_init(&ac->proc); ac->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); if (!ac->fdsp) diff --git a/libavcodec/aac/aacdec_proc_template.c b/libavcodec/aac/aacdec_proc_template.c index 1ffea2f93b..fecf228b3b 100644 --- a/libavcodec/aac/aacdec_proc_template.c +++ b/libavcodec/aac/aacdec_proc_template.c @@ -433,7 +433,10 @@ static int AAC_RENAME(decode_cce)(AACDecContext *ac, GetBitContext *gb, ChannelE return 0; } -static const AACDecProc AAC_RENAME(aac_proc) = { - .decode_spectrum_and_dequant = AAC_RENAME(decode_spectrum_and_dequant), - .decode_cce = AAC_RENAME(decode_cce), -}; +static av_cold void AAC_RENAME(aac_proc_init)(AACDecProc *aac_proc) +{ +#define SET(member) aac_proc->member = AAC_RENAME(member) + SET(decode_spectrum_and_dequant); + SET(decode_cce); +#undef SET +} -- 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".