Remove redundant nnz variable.

[ffmpeg] / libavcodec / fft-test.c

diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index 967c5107047d1c9a857ecbfca31d89b44892aecf..1ab653fc3dc741dc2cf1b3bc1bd306e0b15d3bf3 100644 (file)
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -1,18 +1,20 @@
 /*
  * (c) 2002 Fabrice Bellard
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -25,8 +27,11 @@
 #include <math.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#include <string.h>
 
-int mm_flags;
+#undef exit
+#undef random
 
 /* reference fft */
 
@@ -43,7 +48,7 @@ FFTComplex *exptab;
 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));
@@ -62,7 +67,7 @@ void fft_ref_init(int nbits, int inverse)
 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;
@@ -88,10 +93,11 @@ void fft_ref(FFTComplex *tabr, FFTComplex *tab, int nbits)
     }
 }
 
-void imdct_ref(float *out, float *in, int n)
+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;
@@ -105,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)
+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++) {
@@ -137,13 +144,19 @@ int64_t gettime(void)
 void check_diff(float *tab1, float *tab2, int n)
 {
     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]);
+        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);
 }
 
 
@@ -164,7 +177,7 @@ 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;
@@ -173,7 +186,6 @@ int main(int argc, char **argv)
     MDCTContext m1, *m = &m1;
     int fft_nbits, fft_size;
 
-    mm_flags = 0;
     fft_nbits = 9;
     for(;;) {
         c = getopt(argc, argv, "hsimn:");
@@ -202,7 +214,6 @@ 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) {
@@ -233,13 +244,13 @@ 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);
+            imdct_ref((float *)tab_ref, (float *)tab1, fft_nbits);
+            ff_imdct_calc(m, tab2, (float *)tab1);
             check_diff((float *)tab_ref, tab2, fft_size);
         } 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);
         }
@@ -266,9 +277,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));