interpret H264 VUI timing info correctly

[ffmpeg] / libavcodec / fft-test.c

diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index 09f45c70960fb2190c0c6632e921b1f993391d97..f924dcadfdffc2d85dcf17c1949a584dd39f7cb6 100644 (file)
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -1,4 +1,8 @@
-/* FFT and MDCT tests */
+/**
+ * @file fft-test.c
+ * FFT and MDCT tests.
+ */
+
 #include "dsputil.h"
 #include <math.h>
 #include <unistd.h>
@@ -118,7 +122,7 @@ void check_diff(float *tab1, float *tab2, int n)
 
     for(i=0;i<n;i++) {
         if (fabsf(tab1[i] - tab2[i]) >= 1e-3) {
-            printf("ERROR %d: %f %f\n", 
+            av_log(NULL, AV_LOG_ERROR, "ERROR %d: %f %f\n",
                    i, tab1[i], tab2[i]);
         }
     }
@@ -127,7 +131,7 @@ void check_diff(float *tab1, float *tab2, int n)
 
 void help(void)
 {
-    printf("usage: fft-test [-h] [-s] [-i] [-n b]\n"
+    av_log(NULL, AV_LOG_INFO,"usage: fft-test [-h] [-s] [-i] [-n b]\n"
            "-h     print this help\n"
            "-s     speed test\n"
            "-m     (I)MDCT test\n"
@@ -185,19 +189,19 @@ int main(int argc, char **argv)
 
     if (do_mdct) {
         if (do_inverse)
-            printf("IMDCT");
+            av_log(NULL, AV_LOG_INFO,"IMDCT");
         else
-            printf("MDCT");
+            av_log(NULL, AV_LOG_INFO,"MDCT");
         ff_mdct_init(m, fft_nbits, do_inverse);
     } else {
         if (do_inverse)
-            printf("IFFT");
+            av_log(NULL, AV_LOG_INFO,"IFFT");
         else
-            printf("FFT");
-        fft_init(s, fft_nbits, do_inverse);
+            av_log(NULL, AV_LOG_INFO,"FFT");
+        ff_fft_init(s, fft_nbits, do_inverse);
         fft_ref_init(fft_nbits, do_inverse);
     }
-    printf(" %d test\n", fft_size);
+    av_log(NULL, AV_LOG_INFO," %d test\n", fft_size);
 
     /* generate random data */
 
@@ -207,7 +211,7 @@ int main(int argc, char **argv)
     }
 
     /* checking result */
-    printf("Checking...\n");
+    av_log(NULL, AV_LOG_INFO,"Checking...\n");
 
     if (do_mdct) {
         if (do_inverse) {
@@ -216,16 +220,16 @@ int main(int argc, char **argv)
             check_diff((float *)tab_ref, tab2, fft_size);
         } else {
             mdct_ref((float *)tab_ref, (float *)tab1, fft_size);
-            
+
             ff_mdct_calc(m, tab2, (float *)tab1, tabtmp);
 
             check_diff((float *)tab_ref, tab2, fft_size / 2);
         }
     } else {
         memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
-        fft_permute(s, tab);
-        fft_calc(s, tab);
-        
+        ff_fft_permute(s, tab);
+        ff_fft_calc(s, tab);
+
         fft_ref(tab_ref, tab1, fft_nbits);
         check_diff((float *)tab_ref, (float *)tab, fft_size * 2);
     }
@@ -236,7 +240,7 @@ int main(int argc, char **argv)
         int64_t time_start, duration;
         int nb_its;
 
-        printf("Speed test...\n");
+        av_log(NULL, AV_LOG_INFO,"Speed test...\n");
         /* we measure during about 1 seconds */
         nb_its = 1;
         for(;;) {
@@ -250,7 +254,7 @@ int main(int argc, char **argv)
                     }
                 } else {
                     memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
-                    fft_calc(s, tab);
+                    ff_fft_calc(s, tab);
                 }
             }
             duration = gettime() - time_start;
@@ -258,16 +262,16 @@ int main(int argc, char **argv)
                 break;
             nb_its *= 2;
         }
-        printf("time: %0.1f us/transform [total time=%0.2f s its=%d]\n", 
-               (double)duration / nb_its, 
+        av_log(NULL, AV_LOG_INFO,"time: %0.1f us/transform [total time=%0.2f s its=%d]\n",
+               (double)duration / nb_its,
                (double)duration / 1000000.0,
                nb_its);
     }
-    
+
     if (do_mdct) {
         ff_mdct_end(m);
     } else {
-        fft_end(s);
+        ff_fft_end(s);
     }
     return 0;
 }