alternative LGPL-licensed, MMX-optimized YUV to RGB conversion routines

written by Kostya Shishkov


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@31135 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile

@@ -12,10 +12,9 @@ OBJS-$(ARCH_BFIN)          +=  bfin/internal_bfin.o     \
                                bfin/yuv2rgb_bfin.o
 OBJS-$(CONFIG_MLIB)        +=  mlib/yuv2rgb_mlib.o
 OBJS-$(HAVE_ALTIVEC)       +=  ppc/yuv2rgb_altivec.o
+OBJS-$(HAVE_MMX)           +=  x86/yuv2rgb_mmx.o
 OBJS-$(HAVE_VIS)           +=  sparc/yuv2rgb_vis.o
 
-MMX-OBJS-$(CONFIG_GPL)     +=  x86/yuv2rgb_mmx.o        \
-
 TESTPROGS = colorspace swscale
 
 DIRS = bfin mlib ppc sparc x86

x86/yuv2rgb_mmx.c

@@ -49,14 +49,22 @@ DECLARE_ASM_CONST(8, uint64_t, mmx_grnmask) = 0xfcfcfcfcfcfcfcfcULL;
 #define HAVE_MMX2 0
 #define HAVE_AMD3DNOW 0
 #define RENAME(a) a ## _MMX
+#if CONFIG_GPL
 #include "yuv2rgb_template.c"
+#else
+#include "yuv2rgb_template2.c"
+#endif
 
 //MMX2 versions
 #undef RENAME
 #undef HAVE_MMX2
 #define HAVE_MMX2 1
 #define RENAME(a) a ## _MMX2
+#if CONFIG_GPL
 #include "yuv2rgb_template.c"
+#else
+#include "yuv2rgb_template2.c"
+#endif
 
 SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
 {

yuv2rgb.c

@@ -543,7 +543,7 @@ CLOSEYUV2RGBFUNC(1)
 SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
 {
     SwsFunc t = NULL;
-#if HAVE_MMX && CONFIG_GPL
+#if HAVE_MMX
      t = ff_yuv2rgb_init_mmx(c);
 #endif
 #if HAVE_VIS