build mpegaudio.c and ac3enc.c only if needed

[ffmpeg] / libavcodec / motion_test.c

diff --git a/libavcodec/motion_test.c b/libavcodec/motion_test.c
index 2857eeaf9fbeddaa7c07d74ea80b373ce647b47c..671b5a12fdf8a41b97c40c91de2e882b16f291ea 100644 (file)
--- a/libavcodec/motion_test.c
+++ b/libavcodec/motion_test.c
@@ -1,36 +1,41 @@
-/* motion test. (c) 2001 Gerard Lantau. */
+/* motion test. (c) 2001 Fabrice Bellard. */
+
+/**
+ * @file motion_test.c
+ * motion test.
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <getopt.h>
 
 #include "dsputil.h"
 
 #include "i386/mmx.h"
 
-int pix_abs16x16_mmx(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_mmx1(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_x2_mmx(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_x2_mmx1(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_y2_mmx(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_y2_mmx1(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_xy2_mmx(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_xy2_mmx1(UINT8 *blk1, UINT8 *blk2, int lx, int h);
-int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
+int pix_abs16x16_mmx(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_mmx1(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_x2_mmx(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_x2_mmx1(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_x2_c(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_y2_mmx(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_y2_mmx1(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_y2_c(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_xy2_mmx(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_xy2_mmx1(uint8_t *blk1, uint8_t *blk2, int lx);
+int pix_abs16x16_xy2_c(uint8_t *blk1, uint8_t *blk2, int lx);
 
-typedef int motion_func(UINT8 *blk1, UINT8 *blk2, int lx, int h);
+typedef int motion_func(uint8_t *blk1, uint8_t *blk2, int lx);
 
 #define WIDTH 64
 #define HEIGHT 64
 
-UINT8 img1[WIDTH * HEIGHT];
-UINT8 img2[WIDTH * HEIGHT];
+uint8_t img1[WIDTH * HEIGHT];
+uint8_t img2[WIDTH * HEIGHT];
 
-void fill_random(UINT8 *tab, int size)
+void fill_random(uint8_t *tab, int size)
 {
     int i;
     for(i=0;i<size;i++) {
@@ -49,11 +54,11 @@ void help(void)
     exit(1);
 }
 
-INT64 gettime(void)
+int64_t gettime(void)
 {
     struct timeval tv;
     gettimeofday(&tv,NULL);
-    return (INT64)tv.tv_sec * 1000000 + tv.tv_usec;
+    return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
 }
 
 #define NB_ITS 500
@@ -64,8 +69,8 @@ void test_motion(const char *name,
                  motion_func *test_func, motion_func *ref_func)
 {
     int x, y, d1, d2, it;
-    UINT8 *ptr;
-    INT64 ti;
+    uint8_t *ptr;
+    int64_t ti;
     printf("testing '%s'\n", name);
 
     /* test correctness */
@@ -73,12 +78,12 @@ void test_motion(const char *name,
 
         fill_random(img1, WIDTH * HEIGHT);
         fill_random(img2, WIDTH * HEIGHT);
-        
+
         for(y=0;y<HEIGHT-17;y++) {
             for(x=0;x<WIDTH-17;x++) {
-                ptr = img2 + y * WIDTH + x; 
-                d1 = test_func(img1, ptr, WIDTH, 16);
-                d2 = ref_func(img1, ptr, WIDTH, 16);
+                ptr = img2 + y * WIDTH + x;
+                d1 = test_func(img1, ptr, WIDTH);
+                d2 = ref_func(img1, ptr, WIDTH);
                 if (d1 != d2) {
                     printf("error: mmx=%d c=%d\n", d1, d2);
                 }
@@ -86,24 +91,24 @@ void test_motion(const char *name,
         }
     }
     emms();
-    
+
     /* speed test */
     ti = gettime();
     d1 = 0;
     for(it=0;it<NB_ITS;it++) {
         for(y=0;y<HEIGHT-17;y++) {
             for(x=0;x<WIDTH-17;x++) {
-                ptr = img2 + y * WIDTH + x; 
-                d1 += test_func(img1, ptr, WIDTH, 16);
+                ptr = img2 + y * WIDTH + x;
+                d1 += test_func(img1, ptr, WIDTH);
             }
         }
     }
     emms();
     dummy = d1; /* avoid optimisation */
     ti = gettime() - ti;
-    
-    printf("  %0.0f kop/s\n", 
-           (double)NB_ITS * (WIDTH - 16) * (HEIGHT - 16) / 
+
+    printf("  %0.0f kop/s\n",
+           (double)NB_ITS * (WIDTH - 16) * (HEIGHT - 16) /
            (double)(ti / 1000.0));
 }
 
@@ -111,7 +116,7 @@ void test_motion(const char *name,
 int main(int argc, char **argv)
 {
     int c;
-    
+
     for(;;) {
         c = getopt(argc, argv, "h");
         if (c == -1)
@@ -122,7 +127,7 @@ int main(int argc, char **argv)
             break;
         }
     }
-               
+
     printf("ffmpeg motion test\n");
 
     test_motion("mmx", pix_abs16x16_mmx, pix_abs16x16_c);