# HG changeset patch # User lucabe # Date 1156162529 0 # Node ID b3939dba3c139ab4135ebcb54f7aa8be31e67769 # Parent b9d2ceb637776b7a01a0402724f6dbf6d5724b96 Allow to compile swscale tests diff -r b9d2ceb63777 -r b3939dba3c13 libswscale/Makefile --- a/libswscale/Makefile Mon Aug 21 09:34:12 2006 +0000 +++ b/libswscale/Makefile Mon Aug 21 12:15:29 2006 +0000 @@ -21,3 +21,9 @@ HEADERS = swscale.h rgb2rgb.h include $(SRC_PATH)/common.mak + +cs_test: cs_test.c + $(CC) $(CFLAGS) -o $@ $^ -L. -lswscale -L$(SRC_PATH)/libavutil -lavutil -lm + +swscale-example: swscale-example.c + $(CC) $(CFLAGS) -o $@ $^ -L. -lswscale -L$(SRC_PATH)/libavutil -lavutil -lm diff -r b9d2ceb63777 -r b3939dba3c13 libswscale/cs_test.c --- a/libswscale/cs_test.c Mon Aug 21 09:34:12 2006 +0000 +++ b/libswscale/cs_test.c Mon Aug 21 12:15:29 2006 +0000 @@ -17,12 +17,13 @@ */ #include +#include /* for memset() */ +#include #include #include #include "swscale.h" #include "rgb2rgb.h" -#include "cpudetect.h" #define SIZE 1000 #define srcByte 0x55 @@ -32,11 +33,29 @@ #define memalign(x,y) malloc(y) #endif -static int get_sws_cpuflags() +static int cpu_caps; + +static char *args_parse(int argc, char *argv[]) { - return (gCpuCaps.hasMMX ? SWS_CPU_CAPS_MMX : 0) | - (gCpuCaps.hasMMX2 ? SWS_CPU_CAPS_MMX2 : 0) | - (gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0); + int o; + + while ((o = getopt(argc, argv, "m23")) != -1) { + switch (o) { + case 'm': + cpu_caps |= SWS_CPU_CAPS_MMX; + break; + case '2': + cpu_caps |= SWS_CPU_CAPS_MMX2; + break; + case '3': + cpu_caps |= SWS_CPU_CAPS_3DNOW; + break; + default: + fprintf(stderr, "Unknown option %c\n", o); + } + } + + return argv[optind]; } main(int argc, char **argv) @@ -48,13 +67,9 @@ int passedNum=0; printf("memory corruption test ...\n"); - - if(argc==2){ - GetCpuCaps(&gCpuCaps); - printf("testing mmx\n"); - } - - sws_rgb2rgb_init(get_sws_cpuflags()); + args_parse(argc, argv); + fprintf(stderr, "CPU capabilities forced to %x\n", cpu_caps); + sws_rgb2rgb_init(cpu_caps); for(funcNum=0; funcNum<100; funcNum++){ int width;