[FFmpeg-devel] [PATCH] lavfi/vf_ssim360: Fix compilation with MSVC

[FFmpeg-devel] [PATCH] lavfi/vf_ssim360: Fix compilation with MSVC

[Martin Storsjö]

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ö <martin@martin.st>
---
 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
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavfi/vf_ssim360: Fix compilation with MSVC

[Martin Storsjö]

On Sat, 28 Jan 2023, Martin Storsjö wrote:

> 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ö <martin@martin.st>
> ---
> 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
> -- 
> 2.34.1

OK'd by Anton on irc, pushed.

// Martin
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".