From patchwork Sun Jan 28 13:49:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp1026124pzb; Sun, 28 Jan 2024 05:48:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IHhp5LCclqDnHIBo/bAiIJYvKVScdyZib2z2AmraPqrDUFVzL5d56GbM0RUtZlmHtzqy2NS X-Received: by 2002:aa7:c24c:0:b0:55e:e69c:3c96 with SMTP id y12-20020aa7c24c000000b0055ee69c3c96mr812881edo.1.1706449687856; Sun, 28 Jan 2024 05:48:07 -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 em5-20020a056402364500b0055c0e4c41a4si2717830edb.72.2024.01.28.05.48.07; Sun, 28 Jan 2024 05:48:07 -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=L3rB8ICb; 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 7D9AB68CEE7; Sun, 28 Jan 2024 15:48:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2067.outbound.protection.outlook.com [40.92.73.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D27CA68CDA0 for ; Sun, 28 Jan 2024 15:47:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cEJKDhsvhtcPerie3r0p1L7C7BvAc0thzWyGP51b9I0k7Jz+2IDUYDJZvZgGwrLGa2F/7GYKAayPPfQ5Pc3pe35oPnocqCd2/q21aupBWj1kfgy6qWY6/UeGmdz+KPuztKekqB4rws7IjcZJwyrNxJlpgYyhl+7sl1DvDpMF0C+OhuTafEJ8VSKJxgGH+xmyRC5OlqfYndBt1V1QKStrTlyxMXFMj+/lr4toa3TBE+1nLr2KFqCmW0PoxUPvROr8iD0Tp/w7/TZ/9/jzmxX+CZnPQlspetGFi9IdNNdpXxamxSSEAf7H4A2yEHtaV5+YNi2EtxXDnUfXWsmTvAOdxg== 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=4LNMDyBW6TVEcpTeRJtMBSiVEvNH0Nxo/wRvbyb8feQ=; b=DgBeQ7RfzmGWkhKfuU/qmYb7b7Rysy2NeFSeDCm2hug8+GNGT0JmazmcNRkm6Gb31ZbcngzF7e1v+ayxl5qESgguv9/8FFYzjoSgqlWxj0hsh7KM/r8CTSDR+lOt6ZTk5lSkvs/THL5FdBwgg8FEasAmApmSuZhMzDaVtn0npzwfR4NI7AbEqgnLfT9suPGgaFJzcuydFYCCsqhQDYcVVQa3r2l85dLXjPwkKvW9XDBCRRddP/6K89qHOlxUqoqNTMYoED7hxw7Tiah/oANJK4GKAXXjXQm2fmGRCHdzoXktOfDQzJ+DvWSxql1lTgHfOU4pvRlXlc13N2GMak5QPA== 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=4LNMDyBW6TVEcpTeRJtMBSiVEvNH0Nxo/wRvbyb8feQ=; b=L3rB8ICbJaHOYn1HUf8Ayj7YQwzKps52u/517J7lDCk6/LTsdb23xffudLBTpP5XGEgC8AyPUOqKZurXLDsOktDrwMSYt5a0X04t/Ubrc5GbqnXTucqGUVhqGndSFPTb57Drr2JhDn/vpoBbZkAmr91Ci+eTYHTSdfLXzjuqgvVz7U7A9/nKX8Dsu9YixtOsIMIaZwLd72a0I5GI8sGU6AuemrDc+1gb23ufe0pIB+v9EnUftVDOoeD2lfhjKICfvtA2oiRtnqwikTlvGqwOb5jBKFnoSF4Fn8yevJge5JnYTpWGj+X6vnqroqaTkXUEK9y9NRLLRGQs9iHFuzy1JQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0360.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Sun, 28 Jan 2024 13:47:53 +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.7202.031; Sun, 28 Jan 2024 13:47:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jan 2024 14:49:26 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [I4FJ49GzQt+ETbVmSF/eWcRfiA9raYIJXXosxW3vmCs=] X-ClientProxiedBy: FR0P281CA0009.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240128134927.1039629-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0360:EE_ X-MS-Office365-Filtering-Correlation-Id: 808ed295-0f91-4fc0-4ff5-08dc2007b9ff X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicBhi4AvtkW7ODuyGo+WtJPcSx4dkabiPnue7NTugN6I6XtTxQDP0Oq8S0/7lhBqHMKKaTBIb7snNAb+wVyuYeaj+oqgXWao0gERqyVJgxfRNU/d9V/rm3VCKWz7gY1r9EegQWeNWdLsUsCDBLsqvdhDj2apEb2/tzLkp53n8DS4Zr39WtWkVbpTEtsZgXuy69TppgdzDD+rzx5efqzVhZq0NX6co/sWkZqkGF14v49ZrdheolVLW5GsIGkWiLjw1i1yI+Wy6AmK9riePNiJz4AqielaZyiHOIORVhVn1EaF+BSkAlQsjArLyNpokg5t+H5+0//q7i79AvFUZgSJ6Tbcr1C30i7pvTIA6Oh0SA2GrGx2qWIvHpzfEfvBTPX7/1p1NrwbMmCp4nyrpbJZT7u3Y84MKQ/v5Njnhh5Tw+1NGQ+G3GbnYWkrnWrJu626FAVxPemz872nBqyWt58MHahIRsOgRWluvJ8BLXzoGNhQyM+ggMA85ZZJeI5ECSxEdcnJ04zu63PP8TTqoRtrCvzBuEZKvjY4LggA8Sj4dean9elBlF/XgO909wxEZ65U8P9hCddQ/WFY6mhyK+ZihflFdPR4icO+XJIeZkEEfiMdfPJvZpKQi6XZoVebdEDWADXvQanbx6G0iBYGvzSzXKKatgARnbcI1F5jttzx03ySQD37KGx2+X1lRdqFUYc/S2wEBtXCW9sl3VeQ2VnG97uVX2CuL7QY/DeYqIDfhNpBeA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XiohEUSBcSd2VNwxCarNxwZ399vruLEIH14423BiK6o4FbHmMenRi8PRwiRVSEw1EZVRQl5hCIaBh4nm8dlYkv9RuF2JoPInezGxUd2e7svTyqccw5/RAaA+2Y2xo3YYByRPfpWJz8VWlUmYcNLDA6MB3cefRgITqYJaq0nWTdy4wXD4VI8rhJEpnyF2yzqp3QwprJPXjmvb8yLWKMFzt1cHCHSXkwdsC47LyLRuQIP3skcqDJDk8YwOUeKpdsv0AmX90Nt9X0eQhdEynhqXp595copP8A7hwM1GSSjYIeYBvzugNAIvv1UhF5mWEP9SPArMcnpq1nKFNGMlwkFsad1wzPpHz/m5I39af75zZE5tpiqjJF07yvGeSQIS8qWFg3od+mBRMwlWaD/yIBaboOCkFp5vxlMo9xNDzSJVhefV66Pft8g3cdcRfDtC0AdRZj2pLVOLOJXWPgJZ5ZtVRzzkFjaiZY+Y+rYu46CF1An9Gyotq6cROeGPbh2s6lmNjephUoqVYBM50GHH8DGkMF4OwajXC3LLZqBCBxbhAQfjjtmixAfvi+btj/THRDaSTApd7s80nYE5LLrhVS9lR5jnHAwz/4SmZPFLK8U3q6mHhgjIGT3nTElIwiBSYQjm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SLhKHxhK1WdObqjmcQ8D4m7F8LQoIcolilDa4xS9kjHt33o62A+02HFgC+px1wSyRP4vI6ucWCxxxoXuZbLIDHXJmRYRL6+2qhREZq2+ncuFyxCJjeprrFMbB5MFho3WPRZpkmRXcAZ5EJE78JY5brQI+ADQEqhaPvmkCVFeFz0PLObc9j+yCzYUDHmpCe61JX2qjwetlscqaJ++PT9rMWnw6RDek2hP/CK1vtLvkgVo7XD4HsYjgZD5rL3TjPNOY3QVtIdBiUSZfaORImVW/E/wr3hDaKLzwykiRbFMfZ1SA0K5yYdJrF/SVdOeBHS79GtR4CA7Y456EufN1XgT7+SJGw0rqxtHJgSVCJPA7nuOLUvOfcLcIs8bvCAWgGGFAhmoLqJG13RtQjNlAh4J73R3zLBw5LlpEexhDYDQPEST0dn94zwTTt73BOLhj21UzslMvWFPlh/8tUhnPyQGv4WdF42w8maAdRP/4hHMJHLiRoGHnYOCHurxIRIKp1jTDIs+EuKEGwXz+RHL9YS/hayMZK30tBilKST2HKdmON5nJWsgLk+qAL0P8fCAU9t0Z45D5nVJ8D3A/w+PP61Snsto+QGVluuRIMY6pbq7WndsQtRQCmLNYpYdDqXsiD7TRNwWTInh2703EQ0rWISNLU0HrcIjZuvwf3e2p6dAY7swuJ4j/Ta+QLxA1/3ig8pghtIL7r73gsArnPVedVDKn+DAnSMwQ/zOa3ldLrJIF4Qv3dCVUa87IPJfiJUrVlziXAwNcvzS31gSxPpcrAa0OoQEY3Fta3M04n57tE+ocQmuWp5tM9d6TJ8+2IqBr/czG2khKhzBhCk7GInFAi4RmuVGJxu5bgiDsr+spyHEvQakHOU7s9c4k1exUjk8P/E25AK5Z6eeCmZN4ATzI3dM5Qgg3yiMtjZd1tCm06Rcet5IaQUe5prcCLdZI5/KxHhRMbxCrDpoL00LMrYBUmallu2AEv8rVpsA6V4om6pyoL1AKDNe+mF1/aYVKHJ/K65cVL36WqqWqDhzNb9Ia/VShGcV6GUlcmwihPojwedBpZQYzq3+6XGpFm8CxddD8aCR/1pTfG6/fbOdEmifHyhAeUUx/r2sr2aBrZ22cHJmADYCH57//RPy0bu/Nk5quR8GWJrjwEhqx4S27d0Drc44i1qLGBCObjXZkWS2EOMAgIuiyJezArcv1HXdaNett9cHVMfdaA+P1CFlUtoBj9ryupUtKGfwrUnA85Fcu/UuaAVfiBHsSRlnCEEvbE+IudKI X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 808ed295-0f91-4fc0-4ff5-08dc2007b9ff X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2024 13:47:53.9132 (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: AM8P250MB0360 Subject: [FFmpeg-devel] [PATCH 1/2] Revert "avcodec: Rename ff_kbd_window_init() as it will be needed from outside libavcodec" 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: 8pPflkWMuXyt This reverts commits fd5aa93a37b3fa21195c6d7b22ef655124020e09 and cf00f60bab1f79213c274a6cd4357b32bd5c0101 ("avcodec/kbdwin: Support arbitrary sized windows"). The change in question has only been made for libavradio. in anticipation of merging it into the main tree. This has not happened, so this commit reverts the changes to kbdwin that are not used for anything else. In particular, these functions are no longer exported (as avpriv functions); notice that the fixed-point function has been exported despite having never been used outside of lavc. Signed-off-by: Andreas Rheinhardt --- libavcodec/aacdec_template.c | 8 ++++---- libavcodec/aactab.c | 4 ++-- libavcodec/ac3dec.c | 2 +- libavcodec/ac3enc_fixed.c | 2 +- libavcodec/ac3enc_float.c | 2 +- libavcodec/dolby_e.c | 4 ++-- libavcodec/kbdwin.c | 23 ++++++++--------------- libavcodec/kbdwin.h | 10 ++++------ 8 files changed, 23 insertions(+), 32 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 2b3509c85f..28f4b8110b 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -1130,8 +1130,8 @@ static av_cold void aac_static_table_init(void) ff_aacdec_common_init_once(); // window initialization - AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960); - AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120); + AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960); + AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120); #if !USE_FIXED AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960); @@ -1139,8 +1139,8 @@ static av_cold void aac_static_table_init(void) AAC_RENAME(ff_init_ff_sine_windows)(9); ff_aac_float_common_init(); #else - AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); - AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); + AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); + AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); init_sine_windows_fixed(); #endif diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index 63a478f33f..f34c1ac69e 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -94,8 +94,8 @@ static av_cold void aac_float_common_init(void) { aac_tableinit(); - avpriv_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); - avpriv_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); + ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); + ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); ff_init_ff_sine_windows(10); ff_init_ff_sine_windows(7); } diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index ee50138605..3db71fed39 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -228,7 +228,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) if ((ret = av_tx_init(&s->tx_256, &s->tx_fn_256, IMDCT_TYPE, 1, 256, &scale, 0))) return ret; - AC3_RENAME(avpriv_kbd_window_init)(s->window, 5.0, 256); + AC3_RENAME(ff_kbd_window_init)(s->window, 5.0, 256); ff_bswapdsp_init(&s->bdsp); #if (USE_FIXED) diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 079a43dc39..88dfd66b91 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -82,7 +82,7 @@ static av_cold int ac3_fixed_mdct_init(AC3EncodeContext *s) if (!iwin) return AVERROR(ENOMEM); - avpriv_kbd_window_init(fwin, 5.0, AC3_BLOCK_SIZE); + ff_kbd_window_init(fwin, 5.0, AC3_BLOCK_SIZE); for (int i = 0; i < AC3_BLOCK_SIZE; i++) iwin[i] = lrintf(fwin[i] * (1 << 22)); diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 9664adbf63..ae351a535e 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -92,7 +92,7 @@ static av_cold int ac3_float_mdct_init(AC3EncodeContext *s) return AVERROR(ENOMEM); } - avpriv_kbd_window_init(window, 5.0, AC3_BLOCK_SIZE); + ff_kbd_window_init(window, 5.0, AC3_BLOCK_SIZE); s->mdct_window = window; return av_tx_init(&s->tx, &s->tx_fn, AV_TX_FLOAT_MDCT, 0, diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index b8dac0fa3f..921c33f3ba 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -1200,7 +1200,7 @@ static av_cold void init_tables(void) gain_tab[i] = exp2f((i - 960) / 64.0f); // short 1 - avpriv_kbd_window_init(window, 3.0f, 128); + ff_kbd_window_init(window, 3.0f, 128); for (i = 0; i < 128; i++) window[128 + i] = window[127 - i]; @@ -1227,7 +1227,7 @@ static av_cold void init_tables(void) window[1088 + i] = 1.0f; // long - avpriv_kbd_window_init(window + 1408, 3.0f, 256); + ff_kbd_window_init(window + 1408, 3.0f, 256); for (i = 0; i < 640; i++) window[1664 + i] = 1.0f; for (i = 0; i < 256; i++) diff --git a/libavcodec/kbdwin.c b/libavcodec/kbdwin.c index ff7a7d614e..cb73ceb160 100644 --- a/libavcodec/kbdwin.c +++ b/libavcodec/kbdwin.c @@ -17,27 +17,23 @@ */ #include "libavutil/avassert.h" -#include "libavutil/error.h" #include "libavutil/libm.h" #include "libavutil/mathematics.h" #include "libavutil/attributes.h" -#include "libavutil/mem.h" #include "kbdwin.h" -av_cold static int kbd_window_init(float *float_window, int *int_window, float alpha, int n) +av_cold static void kbd_window_init(float *float_window, int *int_window, float alpha, int n) { int i; double sum = 0.0, tmp; double scale = 0.0; - double temp_small[FF_KBD_WINDOW_MAX / 2 + 1]; - double *temp= n<=FF_KBD_WINDOW_MAX ? temp_small : av_malloc((n/2+1) * sizeof(*temp)); + double temp[FF_KBD_WINDOW_MAX / 2 + 1]; double alpha2 = 4 * (alpha * M_PI / n) * (alpha * M_PI / n); - if (!temp) - return AVERROR(ENOMEM); + av_assert0(n <= FF_KBD_WINDOW_MAX); for (i = 0; i <= n / 2; i++) { - tmp = alpha2 * i * (n - i); + tmp = i * (n - i) * alpha2; temp[i] = av_bessel_i0(sqrt(tmp)); scale += temp[i] * (1 + (i && i /** - * Maximum window size for avpriv_kbd_window_init. + * Maximum window size for ff_kbd_window_init. */ #define FF_KBD_WINDOW_MAX 1024 @@ -30,11 +30,9 @@ * Generate a Kaiser-Bessel Derived Window. * @param window pointer to half window * @param alpha determines window shape - * @param n size of half window - * - * @return if n is larger than FF_KBD_WINDOW_MAX then AVERROR(ENOMEM) is possible + * @param n size of half window, max FF_KBD_WINDOW_MAX */ -int avpriv_kbd_window_init(float *window, float alpha, int n); -int avpriv_kbd_window_init_fixed(int32_t *window, float alpha, int n); +void ff_kbd_window_init(float *window, float alpha, int n); +void ff_kbd_window_init_fixed(int32_t *window, float alpha, int n); #endif /* AVCODEC_KBDWIN_H */ From patchwork Sun Jan 28 13:50:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp1026305pzb; Sun, 28 Jan 2024 05:48:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFo4EvGmH84i2hi+FAYCokPTQs3rNnTGEkGtZu4tgv9aF3kP8FZBEv2vGu/g/slG4nIJ3c X-Received: by 2002:aa7:c1ca:0:b0:558:4a2:42af with SMTP id d10-20020aa7c1ca000000b0055804a242afmr2413572edp.10.1706449716260; Sun, 28 Jan 2024 05:48:36 -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 b19-20020a056402351300b00558e39cd08bsi2557334edd.383.2024.01.28.05.48.35; Sun, 28 Jan 2024 05:48:36 -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=b2HOTylM; 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 DB6ED68D09E; Sun, 28 Jan 2024 15:48:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2081.outbound.protection.outlook.com [40.92.74.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FC9668BCC3 for ; Sun, 28 Jan 2024 15:48:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h3GjIFfNo8iky96miOTidfYE23ZTWPRxxPMrkyJuFHF+tQexpmxxMtjNRAeSWsGKSEPKwM1i8zt9j/T+Cx/7PEji8ufgRzaBmz5GK/TxrhxsnMnHdtFAjb2irZ5wj0rmUgDv/n1LfiRL61UsQE/aerLdpaBe6aL8Z3FK8e9ASHXhuErfwG9UG8go9T8iLMVZfrHwnbXtl2FXTOB79se0drVTTni29KoLpy39BBmIciDVGbblUXrceKZ/N+5g4ijZPpUrRhMt/FVg+6JSB6khl75iBjiaswiIVSU6X9DgIyIZwn+bnAroQq2zmj7ge9ISZNYunWXOs7DiKHCGoMKLaQ== 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=a5gkX91apZoBbsrbMKkIZjKfCmlJvaBfRM6y3zNTiFY=; b=MJPru9KIU0z6kqUDOxUAf0qG7d/AjrhtXIYeKR7wxQRvU7/XV1DQ0mVHinIFlI5MdoMTBjU+glHv4WEL7dbxoTpGVMr6+E3W5vODGK95N7+IOrORbNWmqwTJOgcfUo8+1bac7i3qxKMnj8UTjlo1cK6Sm3XQGKQx1s3ja1ORDSZSHn0N6l719NhCDCUglVQ/wc/4W4f6zevYLFO1EyF/jQdZ1h7Xr9nT8LxhrvxHAo/hNbKd6VoD3Iil9TIDLj3SjfkwARW5ABUEDN9bby6CDSgl9ltsF7uAdo0MHyBNOpKenZGH30io5K+5w7o2ZDefdGRJPdgbNa1wFv231NicCg== 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=a5gkX91apZoBbsrbMKkIZjKfCmlJvaBfRM6y3zNTiFY=; b=b2HOTylMHSQJe2/rtx/f1gaZw16bT8q64/jJjJ058mwZSK1bYohwXnGdOHlYMKI0fMPpyFIJy52ORs77HP2V1yvGrmEp4+CGnNjSPCQdniRF29fcM1xQzh85olMJ2dI0ivBmiUnJegkfjUmklmrBxplbjqXbh0yVTMdz/YycSSziVE7xEVTDrSoouda2iNmZgnd/s/5WyMo3zsE3ih/tjUQiCA2oHHMjSjDMPNZq/coM/6HsBqQNWFWz5IJ20dU8aLvnyoKkLeKEPbDlXFwVIIRV1l2nU0lgFmXm3TM7NRq3F0mz+d+7UNlRIiqvwBLwJdT920fCHP1bfbJmyRdcRA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0360.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Sun, 28 Jan 2024 13:48:30 +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.7202.031; Sun, 28 Jan 2024 13:48:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jan 2024 14:50:04 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [fIH5HuWlVkaCOFjxXQykpyioJDYUX0KdNjBjduWa6fg=] X-ClientProxiedBy: ZR0P278CA0038.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240128135004.1040191-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0360:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c08912f-ef07-4548-861d-08dc2007cf82 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp1wg7CoaBAsx8cV3Aq8MNPTanXp0qNiD3DIVqwbYD1zeHUHsGLAwY93f+AbOPLO9B4jdbPoiG0ZNhrvdEpqqATz7QtIErsuN3hjDGPbs5F2fBLDpFQBZpAoYT1wdJfj4bHRpGFoCWLPnzx0PjA5zaM8+Gd4lAzwxRjg9o9wdp4lPi/BxSflN57Ks9TSRgtIBj+Xhig3hO3f90pUm7fZZv7fMc77rCfFk7Z86Sti7ybtmaR4a6kMogNfSAcCfluX2joZaHSsBJfOIPtBOA3HUabpLohCO6BZmqoMCuDuLqRGbIgRFPsFV0sAb256FC4Zpodq64cbs/TzD1HyAFqysh3BdxqoPXHs7zSj1ZHJpGoV7OIU0wEHuK9UXs9tyJrFIIq+TVqLaDkX46sS9ASxGmtlezfZpVytSy2goDQYdznp4lz3ZwUcjlMFjwdQUyhU/DB/LjHh1w9EWoYOg+lfqpdia7PTdfY2iSQDwBcIlSDf6RAh/XYXBVhdKodCn9hcNuFNXuZRvoLh+PmZXW02gIM0GWhwHs/2fn2Wt8K8qvXlnbjy54QcHW1nafCHZ3rSm6ytzUM1KyTXeVQ3r9RIrSHRPEd/v/IHV3069HsMy1EBfFuplFiLvTXQr57w9ItgpV8R0nwpOy1IV/oGmY+xeTfkAkR7kKHw5yx4d/UEUCZRgY/vi4kjHbMDrmdg2ROQJg4x8qDVWwPABEnoetP7i+rlVP8TJauyGKuALxHqFxOvygA+/US2Xpo73qsDv4q7Lg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PwvdMRKtawrJ1khSLchfqWpwhqG3AuO9BXsqqqFTrbLZrIIYvsAU1jm91BO6WZMjovUC39E+sXu7EvZ/omw+F0jzxAXp7QGnu5lyTUADWPpETpAj5JzPCFnyy7ouMMBBkTuJP9NTiCOcPZhOsvlzJAOX3X5Rcoj+1K1zVMe8wguJ8AeTo0r+KK0aUjhUWreZGTL6oScJkfB31GoHExv7vABULdhJUC2LhSy/wG2lYYoL5JWyovaz+rGDHOYJP3zcqmKjJhTRcgLgm30RknjAyLumNNzkkBzYHRgXaVXLUVhnROZMb+ECq2BmQRPuLBNanRXa6BSBe3JvnU2x7kNVcDSnoSfXKrw6BLsPfaTxEPSlFWdQBclozStzUQAxNTOVuyGxagJM+YJUZ8DBFTNwokNfMRyaKFDQ9zPSpVB4UsCYdVyvvBjWvGPPNaV7ivZQ/8FN/tyHaEN0z41VnB+axb9UXvMAGSBchLWPkPbjojnfIN4Z3UdZHZAI/JizawGi8sZXfHmt7WhGyS7AZqfze6FFkPybefFQAqr6wxhcwRQoEh2Rf2wY7iWu+KqrwPiJNUUq2sEqVvIHvnEmrSdDO14KjncS0/TjpCMh0IEWBNCDUATpmgEPVdRe+i8WW5l5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BX8chDqm/1FZcCjrZ9xLHJjmljIPy2dxSCFZWbxH3bEzooAdkS4zMMgqfjig1vOyG9aV9AReIg0BrKQxeXE68Czi5eV5GcPfPktYtMPMr5vd/rINClo+9XYXIMJn4sE5H+7YD/aWVd872noATtHtRt1U84tmUyJ8GPBoYHSU1BfnuNcqGpUjTuGg3HvN5osDSnaXGsc8d3v6qYFUVU7p1syDfZs4IeSdPVSRKR2Av1LCaFXZeElunyKsaCx29xITTKGstc+szEC7cYYyH31baoCwz4FHfVbXkE1bhWq9q7yDGSnqZE+53AFjVywoi0ycSXf6OloINbh11djdFlzLzIDmqtnFsGumFilzTI2ouCcALlb2xfcnGVxypMopLYMIpBnBLWgWzSZRpFOeBWrUv1xSw6YfNvvx9mzeXiU+RJ2ZlFj0IqrV4peevAOFPrnaQB949d0zT/rM7sr9fMVHFk147JaM8ChRtgk0hgAG3Fb27zeq/4r+PJF+gD5nrXhz5f5nd+nm9PGiRONzUI4A390SRfuNtpqw3Cb4VWffk7l5W8Wb+/IahOYBDAIkxLutuvS87L82+GrZHWbCSzExZadb7BJZAaMRvUFOx2NIv1pDL58TZ1bIBJYzzobefMMfwKVg+8Mm3njNoU7UTco3+86Y0L/uxuwGQGDrDz+Rap4QKh76tl6MWVU5BMH9zSpGThHArfWsvohAhdZ3Ymt3a+t2MBlfnyhex+xHi3PFlE3HBaKNXPMHWfpGT9waNa5GEUoBIobUHUye6Eac+tENCZQrsV3umFdmaMCBrhznZ5ci1W0EgPCkhyBdBzL9WQi+xNXat2YwT6c8FoxZOGdBaCzraRLvU+p1mYYLRpKEzwa+PwTL+4X7GudYsN7KIGvyCJUgkwkJLQZ1PwrSt4bcF9t/6cl298BaSSA2NkDfVA2N3MQWQyW3HFBTvTwHgQFX/TA6rL08z0OF9U5Rv3kQX3dTVNcnekCy+R1kHRwezRH1Pvo14escVSR5r5l88OAdh9C14JAA6KFzrgvqJ5lasFH7eC1l5TlHenUbMneUX8Wya+JhrrPJ8PVKX16QaiExPvpC1gWYVegf4Q+jR0fF/yY50WFKAynSzhc3H0X0EN6OwPnowa69/BS+RPzp9NlmBob3wcrxLJEhCofKj0tkoBsHG71yZ0/XNVKb3BdxllLcFWgAgzAM7oBal2NU4hjG34EDruOBUvnVlOoRUwDm+5yxJfeUFw8FZeW/kQBhbiRbyfAGYPHRfYa+TAuaD3Bh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c08912f-ef07-4548-861d-08dc2007cf82 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2024 13:48:29.9932 (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: AM8P250MB0360 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/aac_defines: Remove unused AAC_RENAME_32 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: MlteEBQ7m7XZ Unused since fbe6a51b11e20c5dfe076877f02d2bbb2300005d. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac_defines.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/aac_defines.h b/libavcodec/aac_defines.h index bd0d93275a..59528f1f0d 100644 --- a/libavcodec/aac_defines.h +++ b/libavcodec/aac_defines.h @@ -30,7 +30,6 @@ #include "libavutil/softfloat.h" #define AAC_RENAME(x) x ## _fixed -#define AAC_RENAME_32(x) x ## _fixed_32 #define AAC_RENAME2(x) x ## _fixed typedef int INTFLOAT; typedef unsigned UINTFLOAT; ///< Equivalent to INTFLOAT, Used as temporal cast to avoid undefined sign overflow operations. @@ -77,7 +76,6 @@ typedef int AAC_SIGNE; #else #define AAC_RENAME(x) x -#define AAC_RENAME_32(x) x #define AAC_RENAME2(x) ff_ ## x typedef float INTFLOAT; typedef float UINTFLOAT;