From patchwork Mon May 22 23:36:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp175388pzb; Mon, 22 May 2023 16:37:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ74tfnX7Q91mzUpHGeI4eOL9HLranc8QZpptSX4zmiQrnbuenRDJeH7QUpYLFQH96vzrvqE X-Received: by 2002:a17:907:6d07:b0:939:e870:2b37 with SMTP id sa7-20020a1709076d0700b00939e8702b37mr10825371ejc.70.1684798621756; Mon, 22 May 2023 16:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684798621; cv=none; d=google.com; s=arc-20160816; b=n6KMv1mwiMGZOSeC7khGisiN/f+XgkOb4Loayo3drTXiY+YWWqBibc3HWMuUzKezje Owk9g2dro2VbMo2gKnNQfS0uK17bI+50je22NYNinAfTgJe6Xwfy0EY6wT+5ZBd14hxA YoV4l2zKU32phUlBXQjVCW5tv+IhIb5CVgNcqfQZFZnatr4rE69gNzjKxIk0rgoHqL8Y FDKPD1yFiB3Ur0ny83mQJx47JD+HsDjNUx6RQ7hA027WUyxBlzVHIxzFtKaJ/xPueNC1 31hwBNdjBDiwcrQ7lYFyF4Fobls/xCra3o6xsieOqCj7PjzjBMCKQsCAfR6nE7GhMIAN naWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=83yoayrvvhrI3qKNYOys4V4caRbl+DH3QJceFeBZ/m4=; b=Z7utYum7YnkTBg3P0dws/xG2GwcgAr6L/2MaiIAGi7c3bdB7uG4CBxODeUU/kWtvjX 6fMcSvsuLNFSyAvijHMXVAZf43ZK/SXAkZNsbXFPmCADSkQiod2bTKbVLpcDl3YiyGx/ hgxydK7MBYNIPiri9JQK4TUSuUTXBNcuc+AwLpr5Pz2WFk8jR+7Y2NauT/23mKvIyxff jtlLOEUP7EdYxCilE4y5M3qFWq1S84dWWWytINAMpWKiHrgL0EWIS52RYw2Zq04HXnud KOn04j0hGwj7QGHjVVXefrmZfj17wpoTfB3xaV06TMm+cB5sWJuHzwoLAM/rA2J7pV8H IfpA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o26-20020a1709062e9a00b009664e704c2dsi409160eji.132.2023.05.22.16.37.01; Mon, 22 May 2023 16:37:01 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59B0168C13C; Tue, 23 May 2023 02:36:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A301268C0F4 for ; Tue, 23 May 2023 02:36:07 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id DB311240003 for ; Mon, 22 May 2023 23:36:06 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 23 May 2023 01:36:01 +0200 Message-Id: <20230522233601.20552-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230522233601.20552-1-michael@niedermayer.cc> References: <20230522233601.20552-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/kbdwin: Remove low precision intermediate in ff_kbd_window_init_fixed() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rGka/mP7mdUu Previously floats where scaled up to 32bit int, but floats do not have 32bits in their mantisse so a quarter of the bits where nonsense. It seems no fate test is affected by this change, which is interresting Signed-off-by: Michael Niedermayer --- libavcodec/kbdwin.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/kbdwin.c b/libavcodec/kbdwin.c index e2f6491124..163f9d5251 100644 --- a/libavcodec/kbdwin.c +++ b/libavcodec/kbdwin.c @@ -21,7 +21,7 @@ #include "libavutil/attributes.h" #include "kbdwin.h" -av_cold void ff_kbd_window_init(float *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; @@ -40,20 +40,22 @@ av_cold void ff_kbd_window_init(float *window, float alpha, int n) for (i = 0; i <= n / 2; i++) { sum += temp[i]; - window[i] = sqrt(sum * scale); + if (float_window) float_window[i] = sqrt(sum * scale); + else int_window[i] = lrint(2147483647 * sqrt(sum * scale)); } for (; i < n; i++) { sum += temp[n - i]; - window[i] = sqrt(sum * scale); + if (float_window) float_window[i] = sqrt(sum * scale); + else int_window[i] = lrint(2147483647 * sqrt(sum * scale)); } } -av_cold void ff_kbd_window_init_fixed(int32_t *window, float alpha, int n) +av_cold void ff_kbd_window_init(float *window, float alpha, int n) { - int i; - float local_window[FF_KBD_WINDOW_MAX]; + kbd_window_init(window, NULL, alpha, n); +} - ff_kbd_window_init(local_window, alpha, n); - for (i = 0; i < n; i++) - window[i] = (int)floor(2147483647.0 * local_window[i] + 0.5); +av_cold void ff_kbd_window_init_fixed(int32_t *window, float alpha, int n) +{ + kbd_window_init(NULL, window, alpha, n); }