X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=fft_pass_effect_test.cpp;h=bce91cec4809809b76a5483cc91422660b2e7f93;hp=1d6693c09ac694d39076a9ef296efa231826bc62;hb=61e2a7671f7b22227dcdc34dd303ae4fcc802aaa;hpb=9651a4eaae012cdc49c1aa38197861e04f62e91e

diff --git a/fft_pass_effect_test.cpp b/fft_pass_effect_test.cpp
index 1d6693c..bce91ce 100644
--- a/fft_pass_effect_test.cpp
+++ b/fft_pass_effect_test.cpp
@@ -3,15 +3,17 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
+#include <epoxy/gl.h>
+#include <gtest/gtest.h>
 
 #include "effect_chain.h"
 #include "fft_pass_effect.h"
-#include "glew.h"
-#include "gtest/gtest.h"
 #include "image_format.h"
 #include "multiply_effect.h"
 #include "test_util.h"
 
+namespace movit {
+
 namespace {
 
 // Generate a random number uniformly distributed between [-1.0, 1.0].
@@ -123,35 +125,36 @@ TEST(FFTPassEffectTest, SingleFrequency) {
 }
 
 TEST(FFTPassEffectTest, Repeat) {
-	const int fft_size = 64;
-	const int num_repeats = 31;  // Prime, to make things more challenging.
-	float data[num_repeats * fft_size * 4] = { 0 };
-	float expected_data[num_repeats * fft_size * 4], out_data[num_repeats * fft_size * 4];
-
 	srand(12345);
-	for (int i = 0; i < num_repeats * fft_size * 4; ++i) {
-		data[i] = uniform_random();
-	}
+	for (int fft_size = 2; fft_size <= 128; fft_size *= 2) {
+		const int num_repeats = 31;  // Prime, to make things more challenging.
+		float data[num_repeats * fft_size * 4];
+		float expected_data[num_repeats * fft_size * 4], out_data[num_repeats * fft_size * 4];
 
-	for (int i = 0; i < num_repeats; ++i) {
-		run_fft(data + i * fft_size * 4, expected_data + i * fft_size * 4, fft_size, false);
-	}
+		for (int i = 0; i < num_repeats * fft_size * 4; ++i) {
+			data[i] = uniform_random();
+		}
 
-	{
-		// Horizontal.
-		EffectChainTester tester(data, num_repeats * fft_size, 1, FORMAT_RGBA_PREMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
-		setup_fft(tester.get_chain(), fft_size, false);
-		tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
+		for (int i = 0; i < num_repeats; ++i) {
+			run_fft(data + i * fft_size * 4, expected_data + i * fft_size * 4, fft_size, false);
+		}
 
-		expect_equal(expected_data, out_data, 4, num_repeats * fft_size);
-	}
-	{
-		// Vertical.
-		EffectChainTester tester(data, 1, num_repeats * fft_size, FORMAT_RGBA_PREMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
-		setup_fft(tester.get_chain(), fft_size, false, false, FFTPassEffect::VERTICAL);
-		tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
+		{
+			// Horizontal.
+			EffectChainTester tester(data, num_repeats * fft_size, 1, FORMAT_RGBA_PREMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+			setup_fft(tester.get_chain(), fft_size, false);
+			tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
+
+			expect_equal(expected_data, out_data, 4, num_repeats * fft_size);
+		}
+		{
+			// Vertical.
+			EffectChainTester tester(data, 1, num_repeats * fft_size, FORMAT_RGBA_PREMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+			setup_fft(tester.get_chain(), fft_size, false, false, FFTPassEffect::VERTICAL);
+			tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 
-		expect_equal(expected_data, out_data, 4, num_repeats * fft_size);
+			expect_equal(expected_data, out_data, 4, num_repeats * fft_size);
+		}
 	}
 }
 
@@ -333,3 +336,5 @@ TEST(FFTPassEffectTest, BigFFTAccuracy) {
 		expect_equal(in, out2, 4, fft_size, max_error, rms_limit);
 	}
 }
+
+}  // namespace movit