From patchwork Mon May 6 12:14:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48581 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp1335047pzb; Mon, 6 May 2024 05:15:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW69K7qJkCzr8QUa1rWRNKEJzDGGrw5etg+BPh8Rx/jB5xJh4ClkdjXGJXpvUsuVic9V1havXFb3L9SbxbqrSwA5JoACwuzrpGQZw== X-Google-Smtp-Source: AGHT+IFZEyujdxCF2dg9zZrMcpdLNxex/0wTu8tyna65gNrF4SH+SKdpZCgGeB6c8S/xki33PYGg X-Received: by 2002:a50:955a:0:b0:572:a06e:e406 with SMTP id v26-20020a50955a000000b00572a06ee406mr6313064eda.33.1714997746792; Mon, 06 May 2024 05:15:46 -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 v8-20020aa7d648000000b00571b67239f2si4707111edr.523.2024.05.06.05.15.44; Mon, 06 May 2024 05:15:46 -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=tDXrImlh; 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 AFF9568D631; Mon, 6 May 2024 15:15:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2059.outbound.protection.outlook.com [40.92.89.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AA1468D60D for ; Mon, 6 May 2024 15:15:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jr8RuNtanc8pv7JU9gD8YC85FKQCiULikVWRLSM9P/wEru2HfwNfAHLtoUEvulVe0wiFfPNzGdjh46xUvYEWxjP1O/uiYu2tlBLRAoMQP6nsSk/aqXyWZoENkdWDPv8+htr0l/7WHv5aRrC4trK8wohQ3Jduiyq67IYbA/7Len4dwQIlJSV5GcdaqZp5HiMHp6F8OHOWYWJM1a7XFe/BeE8m1dfobiQbOaHYNtgUwymB7if0bDd91N4R988D3ifbugemI8BzayXNZ5iSeYvayW7aqCz/R1wFpB8urSi9SD2NzNIeMO0dEB/zBfVEbcIhfpzXhi6l4DwqtxgRdxgTFg== 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=zKUFlZ+QlsKI5Lv/oSbypsvxNUEC96+8tV0lP/gAx8s=; b=CA8cS2bd77iZRy6lhfCv2JaFEuCtFgcjgOtQxzW7BteoDHE5SRuiUwM3NUWiZknOx4ONp2PEvWe15FzpcgdgLv9zzR80xp4EEXCOOBAOgJ4xkjUvSPaeMusCjh3ehEJ8v+tgYqQCQwjboJDlv3RJnHUfNZ8LKyEETp1mdULMIfVP+btMiGx/5KDYNHrkhgaC7XRezotqR4K/Outa4BbtHZD3DkalUsSdLuIiA1gpPf51GuBg74KeL6AXcUzyXPuWlRYwJdTgKqfzXas9Cr6AnNbWJpw8uEaRwTU1Uv3qJVQ3dHWVFEpUdpjnk7dzxPq323L1FaENh556vkef83Dy7w== 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=zKUFlZ+QlsKI5Lv/oSbypsvxNUEC96+8tV0lP/gAx8s=; b=tDXrImlhyCrKhPIaJzkrPMS4IjcnJVGuGDSKuCDObHoFwdFMn42MUikFh86IfnJl/tsH4Tcqeq6nY8OQMvIQCUrBVQlwe7nZocfwHO/RWbRmcjJqdwKBxrPrD6kigSV667XIcJuIiJgRLUUcfrgQtvexLVV5f1OCiwQVVbZS6qw7yUyrGQRwBGHNSgM6nfvdPDVz8LHzqw4NUVPMXNJXEpf/KcM+7iylYKRcCbg1/d5W8eVocOGGsWuBXpxsgwb9MBh+1+5PdS3atX6JCyu0l7roTYO+I6OCTOjlOmIoCL0GAOUtu0odzL9i/8MjReFgkyk61rLUpnIWtAzdFC8usg== 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:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 14:14:30 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Svu2o0VcZ8P5gEFdNMPGkItLHyVkG7qqqzy0R9ROo5k=] 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-5-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: 06a41fac-1942-481d-eda8-08dc6dc6302e X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 13yvFnIzQRgFdjNNi1jA4zsPK+ZxkmzDIEOu2WClq5Hsa8AZk32gjtK1bGzDqCZ93A3j6XcJZcDhfvG4XsUQ5Oz21LTa0ffjL6Xo3kV+mVAe0o433UIlAo6htWuqyaAzufSxtbESxRTGXbODWS4ORt5bPpxkKu6S1YihoTdhE37S6CN/+b7ZddpDKXbowdyfpRqwqSL/TlO1QUtAuJesRLvVcBt8jSK17Qwf03FKfSOaaocoJRTQEil79QRLU/BcGDINe2U18HLj+F/gZpfQaEOlLeIome7srqiBAZYyz6Docuhw6zeP2qOOP+FoLiEEEPbDrEoVHRMkOVhLUWIs2XRip5+/BoOQJEdfTgJG1HYY6oUoVqRvh51eiLm6f7td7mfPFDM/oMpTNvH5AB96Jnggfdb75VbFLGZZMIEvjLCypobeyL397oHsSJH1neHXVqfXzPDvmWDKjBK6yQvZJwUn34BjbWB1Axe/ix1v6Q69blaFnI6NZkqPD4gXQr//nVNUxYyUxmN+ShwyHNn8nQ9eVabQYGl9vRiUkFR4wckhNTUwpwLFb62u2Z4u/gsdcyEQ0p52WMINB6tPUu3whuovZyzSvrs4M5j0XJVZSZfT6mBqLbGouRhVJKPayPwa X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dMgfyKxhCTO2FaYExnOcVsmM6SexYrTrTovqb8FqPyal9k6vj231XVgyUO19nBM/D2e14GHTb7KoBtp7UU5js9tBTKeB5MH16uIFaELelCirRME2/umNnrDcr24BsJlChJB4GpfAQv251MSs5FODxPJk6Z9Dhrcwb6Tc2dupUtJbw57ZIs9GgvmPtG6uLRuLOH/Hp0Sy5A4Var3dbhSJTPNMsISl0XLtPjc711ExvSa8D5kY4Oh3izu3Wr6LZnH+2cn/5ITRQ6IDjzIXVhtpfLuvaNddore1Gg2qETMFHmOoQd4NYG1dp3mlvbTE4B1JP2Y56FCue6sSBIVS05eWZYNgnx7Jm367EG6yd2v2myv25+dVkRbGOHblkBaBk2brF/Ff9E9EMVfQG4QcRzQyl97gHmMgRSULa9FPYN0O2FgJT8dqCbg6/ZAFlEwlJoeaUDVXtmbJO99cJL+gGpz88uwYUBSHe7ozFt/TzG0uIL14Xz5mUbrpCGNT2cRSu2KwfvlfYcQndrnNZFEdLGPiax4M55qPwbTKlucS38+jwScrLA7drgnUv0ojP6mOBDg165Z7HVt+Xk/MZyUkz3uEmN8erTxw2Lc5+smrjs94PsTQxmQ54fbU+y43jNG94FuNo4YZp/ufR/0FmzjDZ5fBKTkD4mnVkoIblWccUsYSx6UWiRMPNPAZygC/LMFmHcfmybaTeo25SN898Q7bLw0tv9I30quyDRYOl9Z3/0aMA91W4TSP0PnvN1a1RdaZDJDz+FboP0tLw8n10IvqbfQkeYp9O2hqlfwLRpIv2wyiG6TpwrRY2IFXgCK/hMynGeprylclhWDK+/wTp3L+A6GhHN2NaT/v33JfYnv8zZ+EyPzUR2DadFzthcMGmTeDu6Zk4kaP3kv3eR/sqfRiJ2YBzEcXSy5tHir+NxqrRy3Z9ElPQwL7wWyqBpGmG2Dn9ocuKBFqgkUFzgm4kVjWWhecoHgcJ9p+rtHIiZwJGLdzGIQtfmT0yLBu3RAwY8IkYbJl5epkRdDLBqFpBJDXH+9XO+cZdcifgihEtxjt2bgD8CxRdMG1p7KV1nKLsLUukWIhIL3ehggbK8hRA6Qs8relD3T26w4zEJz4kdOV94Zzi8PhpEE6fNVwzTxhtmKIaWHHurQWl1ldfs62x7UFXmGtL3ULNgN9l89E4IUItMjelszjc0zX5j4euudhwro8KSw/sAnghfw5AnoBRrXhXFLPgE3haaAMrBuuFKfMQg3zOa2K649diz2mxkQC5B8wZbL8xObX+UtmRA/p19o88Tc6TQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06a41fac-1942-481d-eda8-08dc6dc6302e 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:16.0939 (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 08/12] avcodec/aac/aacdec_(fixed|float): Avoid AAC_RENAME, INTFLOAT 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: 0TmY7D3XZqqu Unnecessary now that this has been detemplatized. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac/aacdec_fixed.c | 20 ++++++++++---------- libavcodec/aac/aacdec_float.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libavcodec/aac/aacdec_fixed.c b/libavcodec/aac/aacdec_fixed.c index 92204180a1..083f3b073e 100644 --- a/libavcodec/aac/aacdec_fixed.c +++ b/libavcodec/aac/aacdec_fixed.c @@ -43,22 +43,22 @@ #include "libavcodec/cbrt_data.h" #include "libavcodec/aacsbr.h" -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME2(aac_kbd_long_1024))[1024]; -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME2(aac_kbd_short_128))[128]; -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_long_960))[960]; -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_short_120))[120]; +DECLARE_ALIGNED(32, static int, aac_kbd_long_1024_fixed)[1024]; +DECLARE_ALIGNED(32, static int, aac_kbd_short_128_fixed)[128]; +DECLARE_ALIGNED(32, static int, aac_kbd_long_960_fixed)[960]; +DECLARE_ALIGNED(32, static int, aac_kbd_short_120_fixed)[120]; static void init_tables_fixed_fn(void) { - AAC_RENAME(ff_cbrt_tableinit)(); + ff_cbrt_tableinit_fixed(); - 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); + ff_kbd_window_init_fixed(aac_kbd_long_1024_fixed, 4.0, 1024); + ff_kbd_window_init_fixed(aac_kbd_short_128_fixed, 6.0, 128); - 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); + ff_kbd_window_init_fixed(aac_kbd_long_960_fixed, 4.0, 960); + ff_kbd_window_init_fixed(aac_kbd_short_120_fixed, 6.0, 120); - AAC_RENAME(ff_aac_sbr_init)(); + ff_aac_sbr_init_fixed(); init_sine_windows_fixed(); } diff --git a/libavcodec/aac/aacdec_float.c b/libavcodec/aac/aacdec_float.c index 511db1a604..5efc0c1e54 100644 --- a/libavcodec/aac/aacdec_float.c +++ b/libavcodec/aac/aacdec_float.c @@ -51,19 +51,19 @@ DECLARE_ALIGNED(32, static float, aac_kbd_short_120)[120]; static void init_tables_float_fn(void) { - AAC_RENAME(ff_cbrt_tableinit)(); + ff_cbrt_tableinit(); - 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); + ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); + ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); - 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); + ff_kbd_window_init(aac_kbd_long_960, 4.0, 960); + ff_kbd_window_init(aac_kbd_short_120, 6.0, 120); - AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960); - AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_120), 120); - AAC_RENAME(ff_init_ff_sine_windows)(9); + ff_sine_window_init(sine_960, 960); + ff_sine_window_init(sine_120, 120); + ff_init_ff_sine_windows(9); - AAC_RENAME(ff_aac_sbr_init)(); + ff_aac_sbr_init(); ff_aac_float_common_init(); }