cosmetics: Reformat some function declarations.

[ffmpeg] / libavcodec / fft-test.c

diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index d2497383d5ba8be5be7b542c049b8eda1f53018c..925711dc76fcb5c5da0a54f3634658904efb6106 100644 (file)
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -19,19 +19,20 @@
  */
 
 /**
- * @file fft-test.c
+ * @file libavcodec/fft-test.c
  * FFT and MDCT tests.
  */
 
+#include "libavutil/lfg.h"
 #include "dsputil.h"
 #include <math.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#include <string.h>
 
 #undef exit
 
-int mm_flags;
-
 /* reference fft */
 
 #define MUL16(a,b) ((a) * (b))
@@ -44,10 +45,10 @@ int mm_flags;
 
 FFTComplex *exptab;
 
-void fft_ref_init(int nbits, int inverse)
+static void fft_ref_init(int nbits, int inverse)
 {
     int n, i;
-    float c1, s1, alpha;
+    double c1, s1, alpha;
 
     n = 1 << nbits;
     exptab = av_malloc((n / 2) * sizeof(FFTComplex));
@@ -63,10 +64,10 @@ void fft_ref_init(int nbits, int inverse)
     }
 }
 
-void fft_ref(FFTComplex *tabr, FFTComplex *tab, int nbits)
+static void fft_ref(FFTComplex *tabr, FFTComplex *tab, int nbits)
 {
     int n, i, j, k, n2;
-    float tmp_re, tmp_im, s, c;
+    double tmp_re, tmp_im, s, c;
     FFTComplex *q;
 
     n = 1 << nbits;
@@ -92,10 +93,11 @@ void fft_ref(FFTComplex *tabr, FFTComplex *tab, int nbits)
     }
 }
 
-void imdct_ref(float *out, float *in, int n)
+static void imdct_ref(float *out, float *in, int nbits)
 {
+    int n = 1<<nbits;
     int k, i, a;
-    float sum, f;
+    double sum, f;
 
     for(i=0;i<n;i++) {
         sum = 0;
@@ -109,10 +111,11 @@ void imdct_ref(float *out, float *in, int n)
 }
 
 /* NOTE: no normalisation by 1 / N is done */
-void mdct_ref(float *output, float *input, int n)
+static void mdct_ref(float *output, float *input, int nbits)
 {
+    int n = 1<<nbits;
     int k, i;
-    float a, s;
+    double a, s;
 
     /* do it by hand */
     for(k=0;k<n/2;k++) {
@@ -126,32 +129,38 @@ void mdct_ref(float *output, float *input, int n)
 }
 
 
-float frandom(void)
+static float frandom(AVLFG *prng)
 {
-    return (float)((random() & 0xffff) - 32768) / 32768.0;
+    return (int16_t)av_lfg_get(prng) / 32768.0;
 }
 
-int64_t gettime(void)
+static int64_t gettime(void)
 {
     struct timeval tv;
     gettimeofday(&tv,NULL);
     return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
 }
 
-void check_diff(float *tab1, float *tab2, int n)
+static void check_diff(float *tab1, float *tab2, int n, double scale)
 {
     int i;
+    double max= 0;
+    double error= 0;
 
     for(i=0;i<n;i++) {
-        if (fabsf(tab1[i] - tab2[i]) >= 1e-3) {
+        double e= fabsf(tab1[i] - (tab2[i] / scale));
+        if (e >= 1e-3) {
             av_log(NULL, AV_LOG_ERROR, "ERROR %d: %f %f\n",
                    i, tab1[i], tab2[i]);
         }
+        error+= e*e;
+        if(e>max) max= e;
     }
+    av_log(NULL, AV_LOG_INFO, "max:%f e:%g\n", max, sqrt(error)/n);
 }
 
 
-void help(void)
+static void help(void)
 {
     av_log(NULL, AV_LOG_INFO,"usage: fft-test [-h] [-s] [-i] [-n b]\n"
            "-h     print this help\n"
@@ -159,6 +168,7 @@ void help(void)
            "-m     (I)MDCT test\n"
            "-i     inverse transform test\n"
            "-n b   set the transform size to 2^b\n"
+           "-f x   set scale factor for output data of (I)MDCT to x\n"
            );
     exit(1);
 }
@@ -168,19 +178,21 @@ void help(void)
 int main(int argc, char **argv)
 {
     FFTComplex *tab, *tab1, *tab_ref;
-    FFTSample *tabtmp, *tab2;
+    FFTSample *tab2;
     int it, i, c;
     int do_speed = 0;
     int do_mdct = 0;
     int do_inverse = 0;
     FFTContext s1, *s = &s1;
-    MDCTContext m1, *m = &m1;
+    FFTContext m1, *m = &m1;
     int fft_nbits, fft_size;
+    double scale = 1.0;
+    AVLFG prng;
+    av_lfg_init(&prng, 1);
 
-    mm_flags = 0;
     fft_nbits = 9;
     for(;;) {
-        c = getopt(argc, argv, "hsimn:");
+        c = getopt(argc, argv, "hsimn:f:");
         if (c == -1)
             break;
         switch(c) {
@@ -199,6 +211,9 @@ int main(int argc, char **argv)
         case 'n':
             fft_nbits = atoi(optarg);
             break;
+        case 'f':
+            scale = atof(optarg);
+            break;
         }
     }
 
@@ -206,15 +221,15 @@ int main(int argc, char **argv)
     tab = av_malloc(fft_size * sizeof(FFTComplex));
     tab1 = av_malloc(fft_size * sizeof(FFTComplex));
     tab_ref = av_malloc(fft_size * sizeof(FFTComplex));
-    tabtmp = av_malloc(fft_size / 2 * sizeof(FFTSample));
     tab2 = av_malloc(fft_size * sizeof(FFTSample));
 
     if (do_mdct) {
+        av_log(NULL, AV_LOG_INFO,"Scale factor is set to %f\n", scale);
         if (do_inverse)
             av_log(NULL, AV_LOG_INFO,"IMDCT");
         else
             av_log(NULL, AV_LOG_INFO,"MDCT");
-        ff_mdct_init(m, fft_nbits, do_inverse);
+        ff_mdct_init(m, fft_nbits, do_inverse, scale);
     } else {
         if (do_inverse)
             av_log(NULL, AV_LOG_INFO,"IFFT");
@@ -228,8 +243,8 @@ int main(int argc, char **argv)
     /* generate random data */
 
     for(i=0;i<fft_size;i++) {
-        tab1[i].re = frandom();
-        tab1[i].im = frandom();
+        tab1[i].re = frandom(&prng);
+        tab1[i].im = frandom(&prng);
     }
 
     /* checking result */
@@ -237,15 +252,15 @@ int main(int argc, char **argv)
 
     if (do_mdct) {
         if (do_inverse) {
-            imdct_ref((float *)tab_ref, (float *)tab1, fft_size);
-            ff_imdct_calc(m, tab2, (float *)tab1, tabtmp);
-            check_diff((float *)tab_ref, tab2, fft_size);
+            imdct_ref((float *)tab_ref, (float *)tab1, fft_nbits);
+            ff_imdct_calc(m, tab2, (float *)tab1);
+            check_diff((float *)tab_ref, tab2, fft_size, scale);
         } else {
-            mdct_ref((float *)tab_ref, (float *)tab1, fft_size);
+            mdct_ref((float *)tab_ref, (float *)tab1, fft_nbits);
 
-            ff_mdct_calc(m, tab2, (float *)tab1, tabtmp);
+            ff_mdct_calc(m, tab2, (float *)tab1);
 
-            check_diff((float *)tab_ref, tab2, fft_size / 2);
+            check_diff((float *)tab_ref, tab2, fft_size / 2, scale);
         }
     } else {
         memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
@@ -253,7 +268,7 @@ int main(int argc, char **argv)
         ff_fft_calc(s, tab);
 
         fft_ref(tab_ref, tab1, fft_nbits);
-        check_diff((float *)tab_ref, (float *)tab, fft_size * 2);
+        check_diff((float *)tab_ref, (float *)tab, fft_size * 2, 1.0);
     }
 
     /* do a speed test */
@@ -270,9 +285,9 @@ int main(int argc, char **argv)
             for(it=0;it<nb_its;it++) {
                 if (do_mdct) {
                     if (do_inverse) {
-                        ff_imdct_calc(m, (float *)tab, (float *)tab1, tabtmp);
+                        ff_imdct_calc(m, (float *)tab, (float *)tab1);
                     } else {
-                        ff_mdct_calc(m, (float *)tab, (float *)tab1, tabtmp);
+                        ff_mdct_calc(m, (float *)tab, (float *)tab1);
                     }
                 } else {
                     memcpy(tab, tab1, fft_size * sizeof(FFTComplex));