diff options
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/imgresample.c | 4 | ||||
| -rw-r--r-- | libavcodec/motion_test.c | 32 |
3 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d66dfcad14..07572d6dcb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -139,14 +139,14 @@ cpuid_test: i386/cputest.c # testing progs imgresample-test: imgresample.c - $(CC) $(CFLAGS) -DTEST -o $@ $^ + $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm dct-test: dct-test.o jfdctfst.o jfdctint.o i386/fdct_mmx.o\ fdctref.o jrevdct.o i386/idct_mmx.o simple_idct.o i386/simple_idct_mmx.o $(CC) -o $@ $^ -lm motion-test: motion_test.o $(LIB) - $(CC) -o $@ $^ + $(CC) -o $@ $^ -lm install: all ifeq ($(BUILD_SHARED),yes) diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c index 4061bdc220..eaba60df05 100644 --- a/libavcodec/imgresample.c +++ b/libavcodec/imgresample.c @@ -539,7 +539,7 @@ static void dump_filter(INT16 *filter) } #ifdef HAVE_MMX -extern int mm_flags; +int mm_flags; #endif int main(int argc, char **argv) @@ -598,7 +598,7 @@ int main(int argc, char **argv) fact = factors[i]; xsize = (int)(XSIZE * fact); ysize = (int)((YSIZE - 100) * fact); - s = img_resample_full_init(xsize, ysize, XSIZE, YSIZE, 50 ,50); + s = img_resample_full_init(xsize, ysize, XSIZE, YSIZE, 50 ,50, 0, 0); printf("Factor=%0.2f\n", fact); dump_filter(&s->h_filters[0][0]); component_resample(s, img1, xsize, xsize, ysize, diff --git a/libavcodec/motion_test.c b/libavcodec/motion_test.c index b0426a2089..14df28e8ea 100644 --- a/libavcodec/motion_test.c +++ b/libavcodec/motion_test.c @@ -10,19 +10,19 @@ #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); - -typedef int motion_func(UINT8 *blk1, UINT8 *blk2, int lx, int h); +int pix_abs16x16_mmx(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_mmx1(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_x2_mmx(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_x2_mmx1(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_y2_mmx(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_y2_mmx1(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_xy2_mmx(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_xy2_mmx1(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx); + +typedef int motion_func(UINT8 *blk1, UINT8 *blk2, int lx); #define WIDTH 64 #define HEIGHT 64 @@ -77,8 +77,8 @@ void test_motion(const char *name, 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); + d1 = test_func(img1, ptr, WIDTH); + d2 = ref_func(img1, ptr, WIDTH); if (d1 != d2) { printf("error: mmx=%d c=%d\n", d1, d2); } @@ -94,7 +94,7 @@ void test_motion(const char *name, 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); + d1 += test_func(img1, ptr, WIDTH); } } } |