Changeset 17320 for trunk/psLib/test/imageops

Timestamp:

Apr 4, 2008, 12:44:56 PM (18 years ago)

Author:

Paul Price

Message:

Optimising psImageConvolveFFT. Made a couple of optimisations: 1. Moved code into psImageFFT.c, so I can use FFTW directly. FFTW, through its 'advanced interface' allows two FFTs to be performed at the same time and 'the resulting plans can often be faster than calling FFTW multiple times for the individual transforms' (FFTW 3.1.2 manual, p30). 2. The convolved image needs to be normalised because FFTW doesn't take out the sqrt(N) factors in the FFT. Instead of multiplying the entire convolved image, we can multiply the much smaller number of pixels in the kernel. Tested this code with tap_psImageConvolve2 and it seems to work. Running convolutionBench unoptimised on mithrandir produces times that are comparable to what I got a while back running optimised. Running it optimized on alala produces speed-ups ranging from 25 to 350%.

Location:

trunk/psLib/test/imageops

Files:

• convolutionBench.c (modified) (1 diff)
• tap_psImageConvolve2.c (modified) (1 diff)

trunk/psLib/test/imageops/convolutionBench.c

@@ -47 +47 @@
             psKernel *kernel = generateKernel(kernelCols, kernelRows);
             psTimerStart("fft");
-            psImage *convolved = psImageConvolveFFT(image, NULL, 0, kernel, 0.0);
+            psImage *convolved = psImageConvolveFFT(NULL, image, NULL, 0, kernel);
             fft += psTimerMark("fft");
             psFree(convolved);

trunk/psLib/test/imageops/tap_psImageConvolve2.c

@@ -95 +95 @@
         psKernel *kernel = generateKernel();
 
-        psImage *convolved = psImageConvolveFFT(image, NULL, 0, kernel, 0.0);
+        psImage *convolved = psImageConvolveFFT(NULL, image, NULL, 0, kernel);
         ok(convolved, "convolution result");
         skip_start(!convolved, 3, "convolution failed");