From patchwork Mon Oct 3 22:45:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38547 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1575770pzh; Mon, 3 Oct 2022 15:46:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vK9z0ObDe+0X4zoQCW/+oB64MLbe/RSeIMN6MwZd8LDq4q+PH2yHo+hMtBKSY7dHRrOy7 X-Received: by 2002:a17:907:a04b:b0:78c:ffac:4bee with SMTP id gz11-20020a170907a04b00b0078cffac4beemr1633870ejc.631.1664837215105; Mon, 03 Oct 2022 15:46:55 -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 ho7-20020a1709070e8700b0077751bae5absi11480911ejc.534.2022.10.03.15.46.54; Mon, 03 Oct 2022 15:46:55 -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=gflzo7tk; 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 7B17568BC11; Tue, 4 Oct 2022 01:46:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2054.outbound.protection.outlook.com [40.92.58.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7301C68BBFD for ; Tue, 4 Oct 2022 01:46:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HxV109hceXD9dSYZYqoXtP7wAcNLkUcUiiVV4ZUxk28NXaat2aN31uNhSe9CJwBL27tjTCha7x/JVXVVOoJDqbSiBBMZ8ZGwKYZoT3Wq3lzshb5U/2Oc6ZOrUsO7AyeMpqxYN3ISbAT5ttSNC7T84CfVTqFxwR+BE8K7pjKsCHAuCBREB3QJ24BGg7PtTvqZjz0OcoXU66pA7VwfYWFWWOjd7SWnqksV4FuD5EhvGeXQhiywZx1vCyflIjpueHUs24NVWjvZoOGIX8j0B35axGz6i6iDX5Gdi8HNfC6trjFdyLDIAqtsy/qfPvYp51v6QYcZiZRoDOz6TlT9QKMHtw== 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=byZ8fdHlT8YQ6pmn5zXSTJtYVWtYk4nWUf0GkczY7H4=; b=H/LBXSjJWjrP2z0f7YRq+Ss9bfqQcmwrx0gRQAOrdpg+mHJqyaGGnkcdkzMVfnfPLH/lT1zd/wNPwL/HGwFrnCPKNKWDMvJjnurGW9O7WYsKXcHDTAzkJGQdI2bX8teotfU7/xEmU1ugtdjJASp1ReSjnZ12C70cdZSiNWIllIMCnoNfd8TkT5KhXyR9EBwRCGkjLMtS1Jz3v4BftLrXvU9sxDIp9bJCxBeWZA6HfGCmy6sAY2mtrQHxxwDesjf+9qi8v94bvC+JCjmTnIY9uq6h1425OM5Bx8WiuOR6BpEtNA0UUl9BZEl7RXi3rf74YrGQ6ddDLBQ5rCinO9wdxA== 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=byZ8fdHlT8YQ6pmn5zXSTJtYVWtYk4nWUf0GkczY7H4=; b=gflzo7tkE6wspsaZqM0mp7FGLr+56h+5vLwwRXrJMf5BEUVmOO7J7RlVYl9C8t8hqydLWtB1/Ytl3mg3yvwTym5I3hmzu+6i7VKl4EYRoqFfmpWCzDRdF9u9LIIGpUTkPrkmyfDXr0y0WbZfc94gmu6Fqdfrvwf78cNHLh60Dl5/c781+hlLH1SyqcTqVoduInusxGoTp7OO/xT9VJTr4ohq4+m+kriMS7Hlgfn4d7nwzsTdRi+YPM5ex4so9i91ixOTwvmmF2CT2q/HZhFJYrtobFdAP/Ifab8d+x9NWtw9OCbrtP03iyS/j07eEVBHPyAk6U2clI0iF59pyPuhoA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0470.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:283::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Mon, 3 Oct 2022 22:46:49 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Mon, 3 Oct 2022 22:46:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2022 00:45:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [3NgspnpXdrMUzr1GD8PitISWZ+eaoIn6novkZlBKYsA=] X-ClientProxiedBy: ZR0P278CA0056.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221003224505.1846824-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0470:EE_ X-MS-Office365-Filtering-Correlation-Id: 155ffd8a-3073-4afe-3f62-08daa5912898 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3lA05FefvWS45JiO4vgSAs1yT/casyrJzAIXO2CPp+ZPL1FtMm3xqXBh2Eal/R8/LKE8YrJYzVPLURmyJLjfD2/meOmNLLQOunmWWshkdst+asDPOWwpuQaVn80t9d1JzJOjpTzT8XQZnqK86ER92vmHK6rFLyoAQQKmBsM6eBq6oUcoin/bJxijqlPGI73Fqke1kPUEWnvL4d6Fvg9aB2DA2wf0vdWkO6QSGs13jbOCAj7wL8+nomGx14QrMPa9QQuThe6tdHUq7KgSuE2Krf2nCrgfYfqXzAwsy24fCyI6/omgl2hkakyFaVWLfkZDw5/h6GNU4hoW/hKDN460F59eEYzc9yFYe5+IUpMDikGUBtAkb6MLjraMgo5E7NcpIngdXo1guWDH8bZS0QWAGHoaVse+CQwZGrWIy2nn7rIUP94Mr37ZCdIy35fOTzmKWt2aUj61dIyl/LY1wJvJCWV9ndhKlyWMl6hKwCagBhQwe8say3CUuaA04Nt1RN38sw0bvBK+zAbxrMicVcBc/rp35pbf6YDP9RpRIHYKgEPSow4GANeCWOLNQjsdFM9oFuN0sxw2X4rAejpZnF1WiqaFkEq8hK1C3+2cmQTZrV5RUexeqLWOQVI87toAMwjw9FCRVNxAdLgUJGyXum3jYp0JIViHua1WfaZEyF+42icmHwYPyZn9XRI7XUDtXEQNtmGMex2ObSXZ4R/8rksRYc9M/thkTrKRxdZ8x8JHig3TGT27U7SB0aOkQFuPz1oZQdZbkGl3R+VAnQr9lY46PDO X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wHHu7o3L3e6XLVuRYC8WHD00wCBJ420T36T9BgEnz492CqZ8yGMGZr1Qjx4BmhmtmgmUBBhRQXQU706Q4VvqG4b0x90VKjTtNQ00Bc5JwjySmsnT5/WQK9+Skwc6qJiDSsbllEHwy05f4HHDzZPXiL2XzdmsKK2DgdhwZdevDc5N/Q3LGfGrINsVFGNKPbLpILCMQ9mxbLxF8Ao2voYFrGcl756hXFuRGhkDg26VBa0WP9ug1f2gjq9PEcVvnOHMBNmDNh5NPNoS7GWUHfLjO8ThvqelN9EfNUVVFoqXu2wL9x2YDqZsQt5tHhe4vbazBslzWStiaqTj3bnnGkJ7ZZgEmCPhpNerZVi+G7kuGRKOEGC0hm2hTSi86YjPl16dUYIs0HQjTZkPXeiNfGiDrSXtGvUrTqHkVEeckpKbbBP+KC7gFwC8nFGmlRuCO/uDP17QiEY5+OdSLLuWsS+u+/IWwodh/VZeNhbnnD6HoDm9GaZJ18EQe6AdC1A8CX/dZPM8+JalEwo3FLyEhlws89iplfkvc0hWWC7GAVPxIgcrSFGqIq8LOblMgZgHA1P1SK4yT+Ldx624guXbE4RLzd48LJ654X9l/P4/bP0tI2XPCF6gs5uEVxvNGcuu9G/OGdW1VjdO4eDg++DtDQhC/WtJ7eQ17ApsXixNUQLfb3ArFinLYJg08FR+6R3pas5Q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fk4SDkrTzjIzqrjkH4gCWREkxmTNKx6Os8XrKxiH8XjUWU9mhpJE0cIaTWp38mXkGXs5faLmcz0nu3PQdI9DMiUbDNPALrmjHfH+yrCYBpcplzjN8+Tms49WaSqeZT0drFhBeuOkTK/qQlL6bLLHMvkZDoOloBHK4YFTi4LlItnP+Prmh6PuSRaYzOX+6i3y/5v4aQOEusaUSW+MvjFEEGTyquULg+Lvgs8rL9u0KKhkBNRLe9ZS1duiSV1EkJc2kFdcr0StkaYur1QorEqj2U1U3WPRUkSm67uFewsJdIXOjoFmPqUTZa31ZhPZk0lr+I8tgCYDtDsqFG60bCDtVIUBo3a/s99pTjlqKSn78NlH3kjkJbgDz78znznKMJX5cMs3uRLhK6LxxfhM4aoDbnjhSKm0xJ8EMdW/UlnEZ2d4mPQzXQ6l2dJXbIBebS/xBfDIR+KST8L3w3DDHrT9RvaA7VbC2YFYW/0WRXfR+iwm1dEloeInEcLc/hZJ9zxNmlec09O05fUPVkof2rEnG8NOZL8pWAmJ3UM6RBiykQh3pTE3QRLy8QL3jnjFLSuSbcgnt3EF05ZKd/wAAvXSTuRT1Soxcdh5f4N25EeWI9jojwZtvUHf0bJcTHPEGAtD+Ro0FlZPhFOqYqe/Qdnkby4y4OkAa6wygEIS/YdURc9Jc/PwQpZ/aB1FHlBFPywG2Y/KRjkZDLtoyEgKcUKZaCB6EZQbJDhD6ljk9OUkMtUBFkI7vdBsHp3Sd2bF+2n4wfygQGCr1dhAJZ9XRkyj0zEtWfImggV8gdjVSUgXmWDa/xrj6uw2KgBCZNIqdMqUvfCDiHicK2674t/h2gzHRMJ7xmgmC6vIcw08Qov+DRYDAyVqWMU+xpgSyL51DG44dJ2xjB01ZvK0BSdLi70wjVK2sIQBI6MqVI4J5/6KY/ABSaFv7zd42mG+5WNbIyo4w4eQJ1UvM6y/zz88aH7OfIh+8n4jVZdP035tza60n1N0tV8S+UHMc2VPaSSTPa9QMNl31MahX+7H6e3u1enQPxzpdcNlVozLQ79Fpwm7qnfXxy/XfkGSySCIyyEH9M1l8t/Yg4RkQoRS2hbrBTAKbn4sRmF5KjbtjYju3JgVSYqQjqbr3DTsn/zEYsuIHYz+ftnlrDbSVltZIJH7rF3Mejgirrvl4yYU7yEcyEb6Vbt5Dg0izCF+HzOm0om73OREjC05ooQSEwPsvSHF8d6+D+eJtHkS4nAPStxlktEaQL5+t3LKG33a+R5/WA6nSLTnIcRMyf3ct2wIvIhHI0FLbod0DoaiJHld3CYQYWiwPeA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 155ffd8a-3073-4afe-3f62-08daa5912898 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 22:46:49.8140 (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: PAXP250MB0470 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/opus_celt, opus_pvq: Move CeltPVQ typedef to opus_pvq.h 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: nbZRJcfpF7un It is more natural that way. Signed-off-by: Andreas Rheinhardt --- libavcodec/opus_celt.h | 4 +--- libavcodec/opus_pvq.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/opus_celt.h b/libavcodec/opus_celt.h index 19cf617652..c812b6645c 100644 --- a/libavcodec/opus_celt.h +++ b/libavcodec/opus_celt.h @@ -44,8 +44,6 @@ #define CELT_POSTFILTER_MINPERIOD 15 #define CELT_ENERGY_SILENCE (-28.0f) -typedef struct CeltPVQ CeltPVQ; - enum CeltSpread { CELT_SPREAD_NONE, CELT_SPREAD_LIGHT, @@ -96,7 +94,7 @@ struct CeltFrame { av_tx_fn tx_fn[4]; AVFloatDSPContext *dsp; CeltBlock block[2]; - CeltPVQ *pvq; + struct CeltPVQ *pvq; OpusDSP opusdsp; int channels; int output_channels; diff --git a/libavcodec/opus_pvq.h b/libavcodec/opus_pvq.h index b30407f5ab..b71bc49034 100644 --- a/libavcodec/opus_pvq.h +++ b/libavcodec/opus_pvq.h @@ -34,13 +34,13 @@ float *lowband_out, int level, float gain, \ float *lowband_scratch, int fill) -struct CeltPVQ { +typedef struct CeltPVQ { DECLARE_ALIGNED(32, int, qcoeff )[256]; DECLARE_ALIGNED(32, float, hadamard_tmp)[256]; float (*pvq_search)(float *X, int *y, int K, int N); QUANT_FN(*quant_band); -}; +} CeltPVQ; void ff_celt_pvq_init_x86(struct CeltPVQ *s);