From patchwork Sat Jan 28 16:20:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 40157 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp2223725pzj; Sat, 28 Jan 2023 08:20:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXvDX6KQf3QNsmQx6ObzImA0ODG6jNxCU5MfnXTeUuTmeWKbBopU3ATuv/cyO25Zw5X6JYJ2 X-Received: by 2002:a17:907:d40c:b0:872:af53:a028 with SMTP id vi12-20020a170907d40c00b00872af53a028mr46709265ejc.61.1674922850863; Sat, 28 Jan 2023 08:20:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674922850; cv=none; d=google.com; s=arc-20160816; b=rkYUE6CxAzVdiMiSgQn7ftrtynwKrTCMxIEoZa7p0ficTwOVl89rCFhJ2A4wLbuszE Csvfy6JFVxgUvCwp59Ydig+yhNWtUs7Dsabe4yEbbOk+DdevILLslB+ncF+QjEAhOYsQ lGhwMNmm5pyBMGVID8ke+Yg+38xymBJU/03j/iU7tJG1vk3gjN8LEcpFd4Sl0xeSwCUf iBlFD55sfdpSLYXGxBpLweGtq0GqZJ04tJXXIjMMmxkLPsaORkjaEo9+3LuClw/ZrDqt tFCt1WDmpdkbznDtNhLJlTkM3yvOgqWnROdDn8wtgMovO4a4oFDuW0GoH2kaqdTIJEGe ZfiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=8Ko8LxZ/GMe26WNLRfY6n0TJch7GO91j3fZMn8qSA7k=; b=CSR3rnbpA58RU3jqxPONEbRQ1Quqt2NJcNhkoqeGrMwfiRTDHWMXA57RjcRfHYWl+9 KPZiDQcwHNYk7OFCm6NK9KWG0A7Ov0BAaJCrFZ2MdRTE18fwQ3XDMMlyuEaDCC2wV4tK 5WuteoMQzTyjdiq8EfbCeC0LbI5fWGCqEFY5gvVKmehMj3X46wX9ePauELSTsmAiSkiy sZXGWNEg3KoGhkvnYTjqd8GuS6AEnNx2LeKT8gcKHt9CjHycrpb8N4aegTBxl0y32Sf1 onAMrgBSp6r4xIh4Y7UzsjhXfwbnZqxsLveGIuOzI8bII263OTYXK1ctg6rNa9i9EgyK 5x1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=b1tpb6DW; 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 cp20-20020a17090793d400b008357d517d6bsi8687361ejc.394.2023.01.28.08.20.50; Sat, 28 Jan 2023 08:20:50 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=b1tpb6DW; 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 7FE5F68BE53; Sat, 28 Jan 2023 18:20:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B08E668BA7F for ; Sat, 28 Jan 2023 18:20:39 +0200 (EET) Received: by mail-io1-f51.google.com with SMTP id q6so341286ior.12 for ; Sat, 28 Jan 2023 08:20:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=q56Zx2tvkuxa2L170E6dpFcGY+egHPearS4oIfh33aA=; b=b1tpb6DWjBGRxRLaYa36uigSuV9pTDb0hhEW3MyaBoAarorNNocFvq+73z4h4ISAFz JY60LTgXLY+NC+LXcvhr4rXVBu5waqOO2c5rBbeuhm2W0s+OqobkGLzIG/rJNXqUVgjQ DK+fqQ3wWA0mUOvko1QITDHtp+896vEwSHue1Q0vDpnpzxzEgm8ShTACRZZahqCWZPeh kNNlP//ajhrw7iT6Rw1YVq4aAraxGPa8VbKZpLCq8npAPAP+lqgVNwBWnY6zvcIZ2Rcl eRSJdSFkS8Oc4oBUnQgKea7HjPKoifP6GfhPNRTJjZYGoBGtkBJIS9qFg2zeJ+1e399w BEcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=q56Zx2tvkuxa2L170E6dpFcGY+egHPearS4oIfh33aA=; b=OQ9k2CZz3+fxpJzmA7wYz19UGf+5sjHnzsUboGVPyZmUbRFlnYSfSOtYu4RYCdRHTC V1OIVi3hx+6QnvaWOlZAKWwOxB0lLW4iusFpbigwqi6SegAs1mIwSXiJa77YDD3/9K+5 0UxkNKY3LuQ+x51tL0NvLXD+UGstcNCxDpZCdV9YZYs8HohwYlxve9hAPZfmZvRmeIUe 8tG45ZI7OclwA6dDqo48tG0sf2WrD04oatxDDSb5Czwxazei3iiSz8DYyizjjqPlub61 LUV0w38jtGpQVw0r7QTtJrMs3CQ2HijyvQEVseEjr2Rje+2VFZnLLRo/FLCcwN2A38Rx V2pw== X-Gm-Message-State: AO0yUKUEpgFix5xDmo52NOvuEY79dYzZfqY2zU15kjiDPQvdArOiosQ+ lErzs6stWRkWlelqmxcgODLDXcve6tsvKA4yHhs= X-Received: by 2002:a6b:c916:0:b0:717:fa6c:4ee2 with SMTP id z22-20020a6bc916000000b00717fa6c4ee2mr1094188iof.19.1674922837932; Sat, 28 Jan 2023 08:20:37 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id l17-20020a026a11000000b003a951542b10sm2704927jac.60.2023.01.28.08.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 08:20:37 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Jan 2023 18:20:33 +0200 Message-Id: <20230128162033.198838-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_ssim360: Fix compilation with MSVC 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: =?utf-8?q?Martin_Storsj=C3=B6?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 48Phacz+W7iQ Don't use "static const" for compile time float constants, but use defines. This fixes the following error: src/libavfilter/vf_ssim360.c(549): error C2099: initializer is not a constant Signed-off-by: Martin Storsjö --- libavfilter/vf_ssim360.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_ssim360.c b/libavfilter/vf_ssim360.c index 0990db0ed5..a0bf73da1e 100644 --- a/libavfilter/vf_ssim360.c +++ b/libavfilter/vf_ssim360.c @@ -72,11 +72,11 @@ #define DEFAULT_EXPANSION_COEF 1.01f -static const float BARREL_THETA_RANGE = DEFAULT_EXPANSION_COEF * 2.0f * M_PI_F; -static const float BARREL_PHI_RANGE = DEFAULT_EXPANSION_COEF * M_PI_2_F; +#define BARREL_THETA_RANGE (DEFAULT_EXPANSION_COEF * 2.0f * M_PI_F) +#define BARREL_PHI_RANGE (DEFAULT_EXPANSION_COEF * M_PI_2_F) // Use fixed-point with 16 bit precision for fast bilinear math -static const int FIXED_POINT_PRECISION = 16; +#define FIXED_POINT_PRECISION 16 // Use 1MB per channel for the histogram to get 5-digit precise SSIM value #define SSIM360_HIST_SIZE 131072