]> git.sesse.net Git - ffmpeg/blobdiff - postproc/rgb2rgb.c
support the LE reader, so it can be tested a little
[ffmpeg] / postproc / rgb2rgb.c
index d345854d9541af9204ba70c7b978bb59b257a54b..fc87b9c02ca992b92ab9265052fdd9018780dc65 100644 (file)
@@ -5,18 +5,85 @@
  *               Software YUV to YUV convertor
  *               Software YUV to RGB convertor
  *  Written by Nick Kurshev.
- *  palette stuff & yuv stuff by Michael
+ *  palette & yuv & runtime cpu stuff by Michael (michaelni@gmx.at) (under GPL)
  */
 #include <inttypes.h>
 #include "../config.h"
 #include "rgb2rgb.h"
-#include "../mmx_defs.h"
-
-#ifdef HAVE_MMX
-static const uint64_t mask32b  __attribute__((aligned(8))) = 0x000000FF000000FFULL;
-static const uint64_t mask32g  __attribute__((aligned(8))) = 0x0000FF000000FF00ULL;
-static const uint64_t mask32r  __attribute__((aligned(8))) = 0x00FF000000FF0000ULL;
+#include "swscale.h"
+#include "../cpudetect.h"
+#include "../mangle.h"
+#include "../bswap.h"
+#include "../libvo/fastmemcpy.h"
+
+#define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit
+
+void (*rgb24to32)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb24to16)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb24to15)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb32to24)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb32to16)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb32to15)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb15to16)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb15to24)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb15to32)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb16to15)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb16to24)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+void (*rgb16to32)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+//void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+void (*rgb32tobgr32)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+//void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+
+void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
+       unsigned int width, unsigned int height,
+       int lumStride, int chromStride, int dstStride);
+void (*yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
+       unsigned int width, unsigned int height,
+       int lumStride, int chromStride, int dstStride);
+void (*yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
+       unsigned int width, unsigned int height,
+       int lumStride, int chromStride, int dstStride);
+void (*yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
+       unsigned int width, unsigned int height,
+       int lumStride, int chromStride, int srcStride);
+void (*rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
+       unsigned int width, unsigned int height,
+       int lumStride, int chromStride, int srcStride);
+void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height, int srcStride, int dstStride);
+void (*interleaveBytes)(uint8_t *src1, uint8_t *src2, uint8_t *dst,
+                           unsigned width, unsigned height, int src1Stride,
+                           int src2Stride, int dstStride);
+void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
+                       uint8_t *dst1, uint8_t *dst2,
+                       unsigned width, unsigned height,
+                       int srcStride1, int srcStride2,
+                       int dstStride1, int dstStride2);
+void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
+                       uint8_t *dst,
+                       unsigned width, unsigned height,
+                       int srcStride1, int srcStride2,
+                       int srcStride3, int dstStride);
+
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
+static const uint64_t mmx_null  __attribute__((aligned(8))) = 0x0000000000000000ULL;
+static const uint64_t mmx_one   __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
+static const uint64_t mask32b  attribute_used __attribute__((aligned(8))) = 0x000000FF000000FFULL;
+static const uint64_t mask32g  attribute_used __attribute__((aligned(8))) = 0x0000FF000000FF00ULL;
+static const uint64_t mask32r  attribute_used __attribute__((aligned(8))) = 0x00FF000000FF0000ULL;
 static const uint64_t mask32   __attribute__((aligned(8))) = 0x00FFFFFF00FFFFFFULL;
+static const uint64_t mask3216br __attribute__((aligned(8)))=0x00F800F800F800F8ULL;
+static const uint64_t mask3216g  __attribute__((aligned(8)))=0x0000FC000000FC00ULL;
+static const uint64_t mask3215g  __attribute__((aligned(8)))=0x0000F8000000F800ULL;
+static const uint64_t mul3216  __attribute__((aligned(8))) = 0x2000000420000004ULL;
+static const uint64_t mul3215  __attribute__((aligned(8))) = 0x2000000820000008ULL;
+static const uint64_t mask24b  attribute_used __attribute__((aligned(8))) = 0x00FF0000FF0000FFULL;
+static const uint64_t mask24g  attribute_used __attribute__((aligned(8))) = 0xFF0000FF0000FF00ULL;
+static const uint64_t mask24r  attribute_used __attribute__((aligned(8))) = 0x0000FF0000FF0000ULL;
 static const uint64_t mask24l  __attribute__((aligned(8))) = 0x0000000000FFFFFFULL;
 static const uint64_t mask24h  __attribute__((aligned(8))) = 0x0000FFFFFF000000ULL;
 static const uint64_t mask24hh  __attribute__((aligned(8))) = 0xffff000000000000ULL;
@@ -25,12 +92,31 @@ static const uint64_t mask24hhhh  __attribute__((aligned(8))) = 0xffffffffffff00
 static const uint64_t mask15b  __attribute__((aligned(8))) = 0x001F001F001F001FULL; /* 00000000 00011111  xxB */
 static const uint64_t mask15rg __attribute__((aligned(8))) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000  RGx */
 static const uint64_t mask15s  __attribute__((aligned(8))) = 0xFFE0FFE0FFE0FFE0ULL;
+static const uint64_t mask15g  __attribute__((aligned(8))) = 0x03E003E003E003E0ULL;
+static const uint64_t mask15r  __attribute__((aligned(8))) = 0x7C007C007C007C00ULL;
+#define mask16b mask15b
+static const uint64_t mask16g  __attribute__((aligned(8))) = 0x07E007E007E007E0ULL;
+static const uint64_t mask16r  __attribute__((aligned(8))) = 0xF800F800F800F800ULL;
 static const uint64_t red_16mask  __attribute__((aligned(8))) = 0x0000f8000000f800ULL;
 static const uint64_t green_16mask __attribute__((aligned(8)))= 0x000007e0000007e0ULL;
 static const uint64_t blue_16mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
 static const uint64_t red_15mask  __attribute__((aligned(8))) = 0x00007c000000f800ULL;
 static const uint64_t green_15mask __attribute__((aligned(8)))= 0x000003e0000007e0ULL;
 static const uint64_t blue_15mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
+
+#ifdef FAST_BGR2YV12
+static const uint64_t bgr2YCoeff  attribute_used __attribute__((aligned(8))) = 0x000000210041000DULL;
+static const uint64_t bgr2UCoeff  attribute_used __attribute__((aligned(8))) = 0x0000FFEEFFDC0038ULL;
+static const uint64_t bgr2VCoeff  attribute_used __attribute__((aligned(8))) = 0x00000038FFD2FFF8ULL;
+#else
+static const uint64_t bgr2YCoeff  attribute_used __attribute__((aligned(8))) = 0x000020E540830C8BULL;
+static const uint64_t bgr2UCoeff  attribute_used __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
+static const uint64_t bgr2VCoeff  attribute_used __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
+#endif
+static const uint64_t bgr2YOffset attribute_used __attribute__((aligned(8))) = 0x1010101010101010ULL;
+static const uint64_t bgr2UVOffset attribute_used __attribute__((aligned(8)))= 0x8080808080808080ULL;
+static const uint64_t w1111       attribute_used __attribute__((aligned(8))) = 0x0001000100010001ULL;
+
 #if 0
 static volatile uint64_t __attribute__((aligned(8))) b5Dither;
 static volatile uint64_t __attribute__((aligned(8))) g5Dither;
@@ -47,199 +133,189 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={
 #endif
 #endif
 
-void rgb24to32(const uint8_t *src,uint8_t *dst,unsigned src_size)
-{
-  uint8_t *dest = dst;
-  const uint8_t *s = src;
-  const uint8_t *end;
-#ifdef HAVE_MMX
-  uint8_t *mm_end;
-#endif
-  end = s + src_size;
-#ifdef HAVE_MMX
-  __asm __volatile(PREFETCH"   %0"::"m"(*s):"memory");
-  mm_end = (uint8_t*)((((unsigned long)end)/(MMREG_SIZE*4))*(MMREG_SIZE*4));
-  __asm __volatile("movq       %0, %%mm7"::"m"(mask32):"memory");
-  if(mm_end == end) mm_end -= MMREG_SIZE*4;
-  while(s < mm_end)
-  {
-    __asm __volatile(
-       PREFETCH"       32%1\n\t"
-       "movd   %1, %%mm0\n\t"
-       "punpckldq 3%1, %%mm0\n\t"
-       "movd   6%1, %%mm1\n\t"
-       "punpckldq 9%1, %%mm1\n\t"
-       "movd   12%1, %%mm2\n\t"
-       "punpckldq 15%1, %%mm2\n\t"
-       "movd   18%1, %%mm3\n\t"
-       "punpckldq 21%1, %%mm3\n\t"
-       "pand   %%mm7, %%mm0\n\t"
-       "pand   %%mm7, %%mm1\n\t"
-       "pand   %%mm7, %%mm2\n\t"
-       "pand   %%mm7, %%mm3\n\t"
-       MOVNTQ" %%mm0, %0\n\t"
-       MOVNTQ" %%mm1, 8%0\n\t"
-       MOVNTQ" %%mm2, 16%0\n\t"
-       MOVNTQ" %%mm3, 24%0"
-       :"=m"(*dest)
-       :"m"(*s)
-       :"memory");
-    dest += 32;
-    s += 24;
-  }
-  __asm __volatile(SFENCE:::"memory");
-  __asm __volatile(EMMS:::"memory");
-#endif
-  while(s < end)
-  {
-    *dest++ = *s++;
-    *dest++ = *s++;
-    *dest++ = *s++;
-    *dest++ = 0;
-  }
-}
-
-void rgb32to24(const uint8_t *src,uint8_t *dst,unsigned src_size)
-{
-  uint8_t *dest = dst;
-  const uint8_t *s = src;
-  const uint8_t *end;
-#ifdef HAVE_MMX
-  uint8_t *mm_end;
-#endif
-  end = s + src_size;
-#ifdef HAVE_MMX
-  __asm __volatile(PREFETCH"   %0"::"m"(*s):"memory");
-  mm_end = (uint8_t*)((((unsigned long)end)/(MMREG_SIZE*4))*(MMREG_SIZE*4));
-  while(s < mm_end)
-  {
-    __asm __volatile(
-       PREFETCH"       32%1\n\t"
-       "movq   %1, %%mm0\n\t"
-       "movq   8%1, %%mm1\n\t"
-       "movq   16%1, %%mm4\n\t"
-       "movq   24%1, %%mm5\n\t"
-       "movq   %%mm0, %%mm2\n\t"
-       "movq   %%mm1, %%mm3\n\t"
-       "movq   %%mm4, %%mm6\n\t"
-       "movq   %%mm5, %%mm7\n\t"
-       "psrlq  $8, %%mm2\n\t"
-       "psrlq  $8, %%mm3\n\t"
-       "psrlq  $8, %%mm6\n\t"
-       "psrlq  $8, %%mm7\n\t"
-       "pand   %2, %%mm0\n\t"
-       "pand   %2, %%mm1\n\t"
-       "pand   %2, %%mm4\n\t"
-       "pand   %2, %%mm5\n\t"
-       "pand   %3, %%mm2\n\t"
-       "pand   %3, %%mm3\n\t"
-       "pand   %3, %%mm6\n\t"
-       "pand   %3, %%mm7\n\t"
-       "por    %%mm2, %%mm0\n\t"
-       "por    %%mm3, %%mm1\n\t"
-       "por    %%mm6, %%mm4\n\t"
-       "por    %%mm7, %%mm5\n\t"
-
-       "movq   %%mm1, %%mm2\n\t"
-       "movq   %%mm4, %%mm3\n\t"
-       "psllq  $48, %%mm2\n\t"
-       "psllq  $32, %%mm3\n\t"
-       "pand   %4, %%mm2\n\t"
-       "pand   %5, %%mm3\n\t"
-       "por    %%mm2, %%mm0\n\t"
-       "psrlq  $16, %%mm1\n\t"
-       "psrlq  $32, %%mm4\n\t"
-       "psllq  $16, %%mm5\n\t"
-       "por    %%mm3, %%mm1\n\t"
-       "pand   %6, %%mm5\n\t"
-       "por    %%mm5, %%mm4\n\t"
-       
-       MOVNTQ" %%mm0, %0\n\t"
-       MOVNTQ" %%mm1, 8%0\n\t"
-       MOVNTQ" %%mm4, 16%0"
-       :"=m"(*dest)
-       :"m"(*s),"m"(mask24l),
-        "m"(mask24h),"m"(mask24hh),"m"(mask24hhh),"m"(mask24hhhh)
-       :"memory");
-    dest += 24;
-    s += 32;
-  }
-  __asm __volatile(SFENCE:::"memory");
-  __asm __volatile(EMMS:::"memory");
-#endif
-  while(s < end)
-  {
-    *dest++ = *s++;
-    *dest++ = *s++;
-    *dest++ = *s++;
-    s++;
-  }
-}
+#define RGB2YUV_SHIFT 8
+#define BY ((int)( 0.098*(1<<RGB2YUV_SHIFT)+0.5))
+#define BV ((int)(-0.071*(1<<RGB2YUV_SHIFT)+0.5))
+#define BU ((int)( 0.439*(1<<RGB2YUV_SHIFT)+0.5))
+#define GY ((int)( 0.504*(1<<RGB2YUV_SHIFT)+0.5))
+#define GV ((int)(-0.368*(1<<RGB2YUV_SHIFT)+0.5))
+#define GU ((int)(-0.291*(1<<RGB2YUV_SHIFT)+0.5))
+#define RY ((int)( 0.257*(1<<RGB2YUV_SHIFT)+0.5))
+#define RV ((int)( 0.439*(1<<RGB2YUV_SHIFT)+0.5))
+#define RU ((int)(-0.148*(1<<RGB2YUV_SHIFT)+0.5))
+
+//Note: we have C, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
+//Plain C versions
+#undef HAVE_MMX
+#undef HAVE_MMX2
+#undef HAVE_3DNOW
+#undef HAVE_SSE2
+#define RENAME(a) a ## _C
+#include "rgb2rgb_template.c"
+
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
+
+//MMX versions
+#undef RENAME
+#define HAVE_MMX
+#undef HAVE_MMX2
+#undef HAVE_3DNOW
+#undef HAVE_SSE2
+#define RENAME(a) a ## _MMX
+#include "rgb2rgb_template.c"
+
+//MMX2 versions
+#undef RENAME
+#define HAVE_MMX
+#define HAVE_MMX2
+#undef HAVE_3DNOW
+#undef HAVE_SSE2
+#define RENAME(a) a ## _MMX2
+#include "rgb2rgb_template.c"
+
+//3DNOW versions
+#undef RENAME
+#define HAVE_MMX
+#undef HAVE_MMX2
+#define HAVE_3DNOW
+#undef HAVE_SSE2
+#define RENAME(a) a ## _3DNOW
+#include "rgb2rgb_template.c"
+
+#endif //ARCH_X86 || ARCH_X86_64
 
 /*
- Original by Strepto/Astral
rgb15->rgb16 Original by Strepto/Astral
  ported to gcc & bugfixed : A'rpi
  MMX2, 3DNOW optimization by Nick Kurshev
  32bit c version, and and&add trick by Michael Niedermayer
 */
-void rgb15to16(const uint8_t *src,uint8_t *dst,unsigned src_size)
-{
-#ifdef HAVE_MMX
-  register const char* s=src+src_size;
-  register char* d=dst+src_size;
-  register int offs=-src_size;
-  __asm __volatile(PREFETCH"   %0"::"m"(*(s+offs)));
-  __asm __volatile(
-       "movq   %0, %%mm4\n\t"
-       ::"m"(mask15s));
-  while(offs<0)
-  {
-       __asm __volatile(
-               PREFETCH"       32%1\n\t"
-               "movq   %1, %%mm0\n\t"
-               "movq   8%1, %%mm2\n\t"
-               "movq   %%mm0, %%mm1\n\t"
-               "movq   %%mm2, %%mm3\n\t"
-               "pand   %%mm4, %%mm0\n\t"
-               "pand   %%mm4, %%mm2\n\t"
-               "paddw  %%mm1, %%mm0\n\t"
-               "paddw  %%mm3, %%mm2\n\t"
-               MOVNTQ" %%mm0, %0\n\t"
-               MOVNTQ" %%mm2, 8%0"
-               :"=m"(*(d+offs))
-               :"m"(*(s+offs))
-               );
-       offs+=16;
-  }
-  __asm __volatile(SFENCE:::"memory");
-  __asm __volatile(EMMS:::"memory");
-#else
-#if 0
-   const uint16_t *s1=( uint16_t * )src;
-   uint16_t *d1=( uint16_t * )dst;
-   uint16_t *e=((uint8_t *)s1)+src_size;
-   while( s1<e ){
-     register int x=*( s1++ );
-     /* rrrrrggggggbbbbb
-        0rrrrrgggggbbbbb
-        0111 1111 1110 0000=0x7FE0
-        00000000000001 1111=0x001F */
-     *( d1++ )=( x&0x001F )|( ( x&0x7FE0 )<<1 );
-   }
-#else
-       const unsigned *s1=( unsigned * )src;
-       unsigned *d1=( unsigned * )dst;
-       int i;
-       int size= src_size>>2;
-       for(i=0; i<size; i++)
-       {
-               register int x= s1[i];
-//             d1[i] = x + (x&0x7FE07FE0); //faster but need msbit =0 which might not allways be true
-               d1[i] = (x&0x7FFF7FFF) + (x&0x7FE07FE0);
 
-       }
-#endif
+void sws_rgb2rgb_init(int flags){
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
+       if(flags & SWS_CPU_CAPS_MMX2){
+               rgb15to16= rgb15to16_MMX2;
+               rgb15to24= rgb15to24_MMX2;
+               rgb15to32= rgb15to32_MMX2;
+               rgb16to24= rgb16to24_MMX2;
+               rgb16to32= rgb16to32_MMX2;
+               rgb16to15= rgb16to15_MMX2;
+               rgb24to16= rgb24to16_MMX2;
+               rgb24to15= rgb24to15_MMX2;
+               rgb24to32= rgb24to32_MMX2;
+               rgb32to16= rgb32to16_MMX2;
+               rgb32to15= rgb32to15_MMX2;
+               rgb32to24= rgb32to24_MMX2;
+               rgb24tobgr15= rgb24tobgr15_MMX2;
+               rgb24tobgr16= rgb24tobgr16_MMX2;
+               rgb24tobgr24= rgb24tobgr24_MMX2;
+               rgb32tobgr32= rgb32tobgr32_MMX2;
+               rgb32tobgr16= rgb32tobgr16_MMX2;
+               rgb32tobgr15= rgb32tobgr15_MMX2;
+               yv12toyuy2= yv12toyuy2_MMX2;
+               yv12touyvy= yv12touyvy_MMX2;
+               yuv422ptoyuy2= yuv422ptoyuy2_MMX2;
+               yuy2toyv12= yuy2toyv12_MMX2;
+//             uyvytoyv12= uyvytoyv12_MMX2;
+//             yvu9toyv12= yvu9toyv12_MMX2;
+               planar2x= planar2x_MMX2;
+               rgb24toyv12= rgb24toyv12_MMX2;
+               interleaveBytes= interleaveBytes_MMX2;
+               vu9_to_vu12= vu9_to_vu12_MMX2;
+               yvu9_to_yuy2= yvu9_to_yuy2_MMX2;
+       }else if(flags & SWS_CPU_CAPS_3DNOW){
+               rgb15to16= rgb15to16_3DNOW;
+               rgb15to24= rgb15to24_3DNOW;
+               rgb15to32= rgb15to32_3DNOW;
+               rgb16to24= rgb16to24_3DNOW;
+               rgb16to32= rgb16to32_3DNOW;
+               rgb16to15= rgb16to15_3DNOW;
+               rgb24to16= rgb24to16_3DNOW;
+               rgb24to15= rgb24to15_3DNOW;
+               rgb24to32= rgb24to32_3DNOW;
+               rgb32to16= rgb32to16_3DNOW;
+               rgb32to15= rgb32to15_3DNOW;
+               rgb32to24= rgb32to24_3DNOW;
+               rgb24tobgr15= rgb24tobgr15_3DNOW;
+               rgb24tobgr16= rgb24tobgr16_3DNOW;
+               rgb24tobgr24= rgb24tobgr24_3DNOW;
+               rgb32tobgr32= rgb32tobgr32_3DNOW;
+               rgb32tobgr16= rgb32tobgr16_3DNOW;
+               rgb32tobgr15= rgb32tobgr15_3DNOW;
+               yv12toyuy2= yv12toyuy2_3DNOW;
+               yv12touyvy= yv12touyvy_3DNOW;
+               yuv422ptoyuy2= yuv422ptoyuy2_3DNOW;
+               yuy2toyv12= yuy2toyv12_3DNOW;
+//             uyvytoyv12= uyvytoyv12_3DNOW;
+//             yvu9toyv12= yvu9toyv12_3DNOW;
+               planar2x= planar2x_3DNOW;
+               rgb24toyv12= rgb24toyv12_3DNOW;
+               interleaveBytes= interleaveBytes_3DNOW;
+               vu9_to_vu12= vu9_to_vu12_3DNOW;
+               yvu9_to_yuy2= yvu9_to_yuy2_3DNOW;
+       }else if(flags & SWS_CPU_CAPS_MMX){
+               rgb15to16= rgb15to16_MMX;
+               rgb15to24= rgb15to24_MMX;
+               rgb15to32= rgb15to32_MMX;
+               rgb16to24= rgb16to24_MMX;
+               rgb16to32= rgb16to32_MMX;
+               rgb16to15= rgb16to15_MMX;
+               rgb24to16= rgb24to16_MMX;
+               rgb24to15= rgb24to15_MMX;
+               rgb24to32= rgb24to32_MMX;
+               rgb32to16= rgb32to16_MMX;
+               rgb32to15= rgb32to15_MMX;
+               rgb32to24= rgb32to24_MMX;
+               rgb24tobgr15= rgb24tobgr15_MMX;
+               rgb24tobgr16= rgb24tobgr16_MMX;
+               rgb24tobgr24= rgb24tobgr24_MMX;
+               rgb32tobgr32= rgb32tobgr32_MMX;
+               rgb32tobgr16= rgb32tobgr16_MMX;
+               rgb32tobgr15= rgb32tobgr15_MMX;
+               yv12toyuy2= yv12toyuy2_MMX;
+               yv12touyvy= yv12touyvy_MMX;
+               yuv422ptoyuy2= yuv422ptoyuy2_MMX;
+               yuy2toyv12= yuy2toyv12_MMX;
+//             uyvytoyv12= uyvytoyv12_MMX;
+//             yvu9toyv12= yvu9toyv12_MMX;
+               planar2x= planar2x_MMX;
+               rgb24toyv12= rgb24toyv12_MMX;
+               interleaveBytes= interleaveBytes_MMX;
+               vu9_to_vu12= vu9_to_vu12_MMX;
+               yvu9_to_yuy2= yvu9_to_yuy2_MMX;
+       }else
 #endif
+       {
+               rgb15to16= rgb15to16_C;
+               rgb15to24= rgb15to24_C;
+               rgb15to32= rgb15to32_C;
+               rgb16to24= rgb16to24_C;
+               rgb16to32= rgb16to32_C;
+               rgb16to15= rgb16to15_C;
+               rgb24to16= rgb24to16_C;
+               rgb24to15= rgb24to15_C;
+               rgb24to32= rgb24to32_C;
+               rgb32to16= rgb32to16_C;
+               rgb32to15= rgb32to15_C;
+               rgb32to24= rgb32to24_C;
+               rgb24tobgr15= rgb24tobgr15_C;
+               rgb24tobgr16= rgb24tobgr16_C;
+               rgb24tobgr24= rgb24tobgr24_C;
+               rgb32tobgr32= rgb32tobgr32_C;
+               rgb32tobgr16= rgb32tobgr16_C;
+               rgb32tobgr15= rgb32tobgr15_C;
+               yv12toyuy2= yv12toyuy2_C;
+               yv12touyvy= yv12touyvy_C;
+               yuv422ptoyuy2= yuv422ptoyuy2_C;
+               yuy2toyv12= yuy2toyv12_C;
+//             uyvytoyv12= uyvytoyv12_C;
+//             yvu9toyv12= yvu9toyv12_C;
+               planar2x= planar2x_C;
+               rgb24toyv12= rgb24toyv12_C;
+               interleaveBytes= interleaveBytes_C;
+               vu9_to_vu12= vu9_to_vu12_C;
+               yvu9_to_yuy2= yvu9_to_yuy2_C;
+       }
 }
 
 /**
@@ -248,8 +324,48 @@ void rgb15to16(const uint8_t *src,uint8_t *dst,unsigned src_size)
 void palette8torgb32(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
 {
        unsigned i;
+
+/*
        for(i=0; i<num_pixels; i++)
                ((unsigned *)dst)[i] = ((unsigned *)palette)[ src[i] ];
+*/
+
+       for(i=0; i<num_pixels; i++)
+       {
+               #ifdef WORDS_BIGENDIAN
+               dst[3]= palette[ src[i]*4+2 ];
+               dst[2]= palette[ src[i]*4+1 ];
+               dst[1]= palette[ src[i]*4+0 ];
+               #else
+               //FIXME slow?
+               dst[0]= palette[ src[i]*4+2 ];
+               dst[1]= palette[ src[i]*4+1 ];
+               dst[2]= palette[ src[i]*4+0 ];
+//             dst[3]= 0; /* do we need this cleansing? */
+               #endif
+               dst+= 4;
+       }
+}
+
+void palette8tobgr32(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
+{
+       unsigned i;
+       for(i=0; i<num_pixels; i++)
+       {
+               #ifdef WORDS_BIGENDIAN
+               dst[3]= palette[ src[i]*4+0 ];
+               dst[2]= palette[ src[i]*4+1 ];
+               dst[1]= palette[ src[i]*4+2 ];
+               #else
+               //FIXME slow?
+               dst[0]= palette[ src[i]*4+0 ];
+               dst[1]= palette[ src[i]*4+1 ];
+               dst[2]= palette[ src[i]*4+2 ];
+//             dst[3]= 0; /* do we need this cleansing? */
+               #endif
+               
+               dst+= 4;
+       }
 }
 
 /**
@@ -266,680 +382,233 @@ void palette8torgb24(const uint8_t *src, uint8_t *dst, unsigned num_pixels, cons
        for(i=0; i<num_pixels; i++)
        {
                //FIXME slow?
-               dst[0]= palette[ src[i]*4+0 ];
+               dst[0]= palette[ src[i]*4+2 ];
                dst[1]= palette[ src[i]*4+1 ];
-               dst[2]= palette[ src[i]*4+2 ];
+               dst[2]= palette[ src[i]*4+0 ];
                dst+= 3;
        }
 }
 
-void rgb32to16(const uint8_t *src, uint8_t *dst, unsigned src_size)
+void palette8tobgr24(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
 {
-#ifdef HAVE_MMX
-       const uint8_t *s = src;
-       const uint8_t *end,*mm_end;
-       uint16_t *d = (uint16_t *)dst;
-       end = s + src_size;
-       mm_end = (uint8_t*)((((unsigned long)end)/(MMREG_SIZE*2))*(MMREG_SIZE*2));
-       __asm __volatile(PREFETCH"      %0"::"m"(*src):"memory");
-       __asm __volatile(
-           "movq       %0, %%mm7\n\t"
-           "movq       %1, %%mm6\n\t"
-           ::"m"(red_16mask),"m"(green_16mask));
-       while(s < mm_end)
-       {
-           __asm __volatile(
-               PREFETCH" 32%1\n\t"
-               "movd   %1, %%mm0\n\t"
-               "movd   4%1, %%mm3\n\t"
-               "punpckldq 8%1, %%mm0\n\t"
-               "punpckldq 12%1, %%mm3\n\t"
-               "movq   %%mm0, %%mm1\n\t"
-               "movq   %%mm0, %%mm2\n\t"
-               "movq   %%mm3, %%mm4\n\t"
-               "movq   %%mm3, %%mm5\n\t"
-               "psrlq  $3, %%mm0\n\t"
-               "psrlq  $3, %%mm3\n\t"
-               "pand   %2, %%mm0\n\t"
-               "pand   %2, %%mm3\n\t"
-               "psrlq  $5, %%mm1\n\t"
-               "psrlq  $5, %%mm4\n\t"
-               "pand   %%mm6, %%mm1\n\t"
-               "pand   %%mm6, %%mm4\n\t"
-               "psrlq  $8, %%mm2\n\t"
-               "psrlq  $8, %%mm5\n\t"
-               "pand   %%mm7, %%mm2\n\t"
-               "pand   %%mm7, %%mm5\n\t"
-               "por    %%mm1, %%mm0\n\t"
-               "por    %%mm4, %%mm3\n\t"
-               "por    %%mm2, %%mm0\n\t"
-               "por    %%mm5, %%mm3\n\t"
-               "psllq  $16, %%mm3\n\t"
-               "por    %%mm3, %%mm0\n\t"
-               MOVNTQ" %%mm0, %0\n\t"
-               :"=m"(*d):"m"(*s),"m"(blue_16mask):"memory");
-               d += 4;
-               s += 16;
-       }
-       while(s < end)
+       unsigned i;
+/*
+       writes 1 byte o much and might cause alignment issues on some architectures?
+       for(i=0; i<num_pixels; i++)
+               ((unsigned *)(&dst[i*3])) = ((unsigned *)palette)[ src[i] ];
+*/
+       for(i=0; i<num_pixels; i++)
        {
-               const int b= *s++;
-               const int g= *s++;
-               const int r= *s++;
-               *d++ = (b>>3) | ((g&0xFC)<<3) | ((r&0xF8)<<8);
+               //FIXME slow?
+               dst[0]= palette[ src[i]*4+0 ];
+               dst[1]= palette[ src[i]*4+1 ];
+               dst[2]= palette[ src[i]*4+2 ];
+               dst+= 3;
        }
-       __asm __volatile(SFENCE:::"memory");
-       __asm __volatile(EMMS:::"memory");
-#else
-       unsigned j,i,num_pixels=src_size/4;
-       uint16_t *d = (uint16_t *)dst;
-       for(i=0,j=0; j<num_pixels; i+=4,j++)
-       {
-               const int b= src[i+0];
-               const int g= src[i+1];
-               const int r= src[i+2];
+}
 
-               d[j]= (b>>3) | ((g&0xFC)<<3) | ((r&0xF8)<<8);
-       }
-#endif
+/**
+ * Palette is assumed to contain bgr16, see rgb32to16 to convert the palette
+ */
+void palette8torgb16(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
+{
+       unsigned i;
+       for(i=0; i<num_pixels; i++)
+               ((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
+}
+void palette8tobgr16(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
+{
+       unsigned i;
+       for(i=0; i<num_pixels; i++)
+               ((uint16_t *)dst)[i] = bswap_16(((uint16_t *)palette)[ src[i] ]);
 }
 
-void rgb32to15(const uint8_t *src, uint8_t *dst, unsigned src_size)
+/**
+ * Pallete is assumed to contain bgr15, see rgb32to15 to convert the palette
+ */
+void palette8torgb15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
 {
-#ifdef HAVE_MMX
-       const uint8_t *s = src;
-       const uint8_t *end,*mm_end;
-       uint16_t *d = (uint16_t *)dst;
-       end = s + src_size;
-       mm_end = (uint8_t*)((((unsigned long)end)/(MMREG_SIZE*2))*(MMREG_SIZE*2));
-       __asm __volatile(PREFETCH"      %0"::"m"(*src):"memory");
-       __asm __volatile(
-           "movq       %0, %%mm7\n\t"
-           "movq       %1, %%mm6\n\t"
-           ::"m"(red_15mask),"m"(green_15mask));
-       while(s < mm_end)
-       {
-           __asm __volatile(
-               PREFETCH" 32%1\n\t"
-               "movd   %1, %%mm0\n\t"
-               "movd   4%1, %%mm3\n\t"
-               "punpckldq 8%1, %%mm0\n\t"
-               "punpckldq 12%1, %%mm3\n\t"
-               "movq   %%mm0, %%mm1\n\t"
-               "movq   %%mm0, %%mm2\n\t"
-               "movq   %%mm3, %%mm4\n\t"
-               "movq   %%mm3, %%mm5\n\t"
-               "psrlq  $3, %%mm0\n\t"
-               "psrlq  $3, %%mm3\n\t"
-               "pand   %2, %%mm0\n\t"
-               "pand   %2, %%mm3\n\t"
-               "psrlq  $6, %%mm1\n\t"
-               "psrlq  $6, %%mm4\n\t"
-               "pand   %%mm6, %%mm1\n\t"
-               "pand   %%mm6, %%mm4\n\t"
-               "psrlq  $9, %%mm2\n\t"
-               "psrlq  $9, %%mm5\n\t"
-               "pand   %%mm7, %%mm2\n\t"
-               "pand   %%mm7, %%mm5\n\t"
-               "por    %%mm1, %%mm0\n\t"
-               "por    %%mm4, %%mm3\n\t"
-               "por    %%mm2, %%mm0\n\t"
-               "por    %%mm5, %%mm3\n\t"
-               "psllq  $16, %%mm3\n\t"
-               "por    %%mm3, %%mm0\n\t"
-               MOVNTQ" %%mm0, %0\n\t"
-               :"=m"(*d):"m"(*s),"m"(blue_15mask):"memory");
-               d += 4;
-               s += 16;
-       }
-       while(s < end)
-       {
-               const int b= *s++;
-               const int g= *s++;
-               const int r= *s++;
-               *d++ = (b>>3) | ((g&0xF8)<<2) | ((r&0xF8)<<7);
-       }
-       __asm __volatile(SFENCE:::"memory");
-       __asm __volatile(EMMS:::"memory");
-#else
-       unsigned j,i,num_pixels=src_size/4;
-       uint16_t *d = (uint16_t *)dst;
-       for(i=0,j=0; j<num_pixels; i+=4,j++)
-       {
-               const int b= src[i+0];
-               const int g= src[i+1];
-               const int r= src[i+2];
+       unsigned i;
+       for(i=0; i<num_pixels; i++)
+               ((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
+}
+void palette8tobgr15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
+{
+       unsigned i;
+       for(i=0; i<num_pixels; i++)
+               ((uint16_t *)dst)[i] = bswap_16(((uint16_t *)palette)[ src[i] ]);
+}
 
-               d[j]= (b>>3) | ((g&0xF8)<<2) | ((r&0xF8)<<7);
+void rgb32tobgr24(const uint8_t *src, uint8_t *dst, unsigned int src_size)
+{
+       unsigned i;
+       unsigned num_pixels = src_size >> 2;
+       for(i=0; i<num_pixels; i++)
+       {
+               dst[3*i + 0] = src[4*i + 2];
+               dst[3*i + 1] = src[4*i + 1];
+               dst[3*i + 2] = src[4*i + 0];
        }
-#endif
 }
 
-void rgb24to16(const uint8_t *src, uint8_t *dst, unsigned src_size)
+void rgb24tobgr32(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
-#ifdef HAVE_MMX
-       const uint8_t *s = src;
-       const uint8_t *end,*mm_end;
-       uint16_t *d = (uint16_t *)dst;
-       end = s + src_size;
-       mm_end = (uint8_t*)((((unsigned long)end)/(MMREG_SIZE*2))*(MMREG_SIZE*2));
-       __asm __volatile(PREFETCH"      %0"::"m"(*src):"memory");
-       __asm __volatile(
-           "movq       %0, %%mm7\n\t"
-           "movq       %1, %%mm6\n\t"
-           ::"m"(red_16mask),"m"(green_16mask));
-       if(mm_end == end) mm_end -= MMREG_SIZE*2;
-       while(s < mm_end)
+       unsigned i;
+       for(i=0; 3*i<src_size; i++)
        {
-           __asm __volatile(
-               PREFETCH" 32%1\n\t"
-               "movd   %1, %%mm0\n\t"
-               "movd   3%1, %%mm3\n\t"
-               "punpckldq 6%1, %%mm0\n\t"
-               "punpckldq 9%1, %%mm3\n\t"
-               "movq   %%mm0, %%mm1\n\t"
-               "movq   %%mm0, %%mm2\n\t"
-               "movq   %%mm3, %%mm4\n\t"
-               "movq   %%mm3, %%mm5\n\t"
-               "psrlq  $3, %%mm0\n\t"
-               "psrlq  $3, %%mm3\n\t"
-               "pand   %2, %%mm0\n\t"
-               "pand   %2, %%mm3\n\t"
-               "psrlq  $5, %%mm1\n\t"
-               "psrlq  $5, %%mm4\n\t"
-               "pand   %%mm6, %%mm1\n\t"
-               "pand   %%mm6, %%mm4\n\t"
-               "psrlq  $8, %%mm2\n\t"
-               "psrlq  $8, %%mm5\n\t"
-               "pand   %%mm7, %%mm2\n\t"
-               "pand   %%mm7, %%mm5\n\t"
-               "por    %%mm1, %%mm0\n\t"
-               "por    %%mm4, %%mm3\n\t"
-               "por    %%mm2, %%mm0\n\t"
-               "por    %%mm5, %%mm3\n\t"
-               "psllq  $16, %%mm3\n\t"
-               "por    %%mm3, %%mm0\n\t"
-               MOVNTQ" %%mm0, %0\n\t"
-               :"=m"(*d):"m"(*s),"m"(blue_16mask):"memory");
-               d += 4;
-               s += 12;
+               dst[4*i + 0] = src[3*i + 2];
+               dst[4*i + 1] = src[3*i + 1];
+               dst[4*i + 2] = src[3*i + 0];
+               dst[4*i + 3] = 0;
        }
+}
+
+void rgb16tobgr32(const uint8_t *src, uint8_t *dst, unsigned int src_size)
+{
+       const uint16_t *end;
+       uint8_t *d = (uint8_t *)dst;
+       const uint16_t *s = (uint16_t *)src;
+       end = s + src_size/2;
        while(s < end)
        {
-               const int b= *s++;
-               const int g= *s++;
-               const int r= *s++;
-               *d++ = (b>>3) | ((g&0xFC)<<3) | ((r&0xF8)<<8);
+               register uint16_t bgr;
+               bgr = *s++;
+               *d++ = (bgr&0xF800)>>8;
+               *d++ = (bgr&0x7E0)>>3;
+               *d++ = (bgr&0x1F)<<3;
+               *d++ = 0;
        }
-       __asm __volatile(SFENCE:::"memory");
-       __asm __volatile(EMMS:::"memory");
-#else
-       unsigned j,i,num_pixels=src_size/3;
-       uint16_t *d = (uint16_t *)dst;
-       for(i=0,j=0; j<num_pixels; i+=3,j++)
-       {
-               const int b= src[i+0];
-               const int g= src[i+1];
-               const int r= src[i+2];
-
-               d[j]= (b>>3) | ((g&0xFC)<<3) | ((r&0xF8)<<8);
-       }
-#endif
 }
 
-void rgb24to15(const uint8_t *src, uint8_t *dst, unsigned src_size)
+void rgb16tobgr24(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
-#ifdef HAVE_MMX
-       const uint8_t *s = src;
-       const uint8_t *end,*mm_end;
-       uint16_t *d = (uint16_t *)dst;
-       end = s + src_size;
-       mm_end = (uint8_t*)((((unsigned long)end)/(MMREG_SIZE*2))*(MMREG_SIZE*2));
-       __asm __volatile(PREFETCH"      %0"::"m"(*src):"memory");
-       __asm __volatile(
-           "movq       %0, %%mm7\n\t"
-           "movq       %1, %%mm6\n\t"
-           ::"m"(red_15mask),"m"(green_15mask));
-       if(mm_end == end) mm_end -= MMREG_SIZE*2;
-       while(s < mm_end)
-       {
-           __asm __volatile(
-               PREFETCH" 32%1\n\t"
-               "movd   %1, %%mm0\n\t"
-               "movd   3%1, %%mm3\n\t"
-               "punpckldq 6%1, %%mm0\n\t"
-               "punpckldq 9%1, %%mm3\n\t"
-               "movq   %%mm0, %%mm1\n\t"
-               "movq   %%mm0, %%mm2\n\t"
-               "movq   %%mm3, %%mm4\n\t"
-               "movq   %%mm3, %%mm5\n\t"
-               "psrlq  $3, %%mm0\n\t"
-               "psrlq  $3, %%mm3\n\t"
-               "pand   %2, %%mm0\n\t"
-               "pand   %2, %%mm3\n\t"
-               "psrlq  $6, %%mm1\n\t"
-               "psrlq  $6, %%mm4\n\t"
-               "pand   %%mm6, %%mm1\n\t"
-               "pand   %%mm6, %%mm4\n\t"
-               "psrlq  $9, %%mm2\n\t"
-               "psrlq  $9, %%mm5\n\t"
-               "pand   %%mm7, %%mm2\n\t"
-               "pand   %%mm7, %%mm5\n\t"
-               "por    %%mm1, %%mm0\n\t"
-               "por    %%mm4, %%mm3\n\t"
-               "por    %%mm2, %%mm0\n\t"
-               "por    %%mm5, %%mm3\n\t"
-               "psllq  $16, %%mm3\n\t"
-               "por    %%mm3, %%mm0\n\t"
-               MOVNTQ" %%mm0, %0\n\t"
-               :"=m"(*d):"m"(*s),"m"(blue_15mask):"memory");
-               d += 4;
-               s += 12;
-       }
+       const uint16_t *end;
+       uint8_t *d = (uint8_t *)dst;
+       const uint16_t *s = (const uint16_t *)src;
+       end = s + src_size/2;
        while(s < end)
        {
-               const int b= *s++;
-               const int g= *s++;
-               const int r= *s++;
-               *d++ = (b>>3) | ((g&0xF8)<<2) | ((r&0xF8)<<7);
+               register uint16_t bgr;
+               bgr = *s++;
+               *d++ = (bgr&0xF800)>>8;
+               *d++ = (bgr&0x7E0)>>3;
+               *d++ = (bgr&0x1F)<<3;
        }
-       __asm __volatile(SFENCE:::"memory");
-       __asm __volatile(EMMS:::"memory");
-#else
-       unsigned j,i,num_pixels=src_size/3;
-       uint16_t *d = (uint16_t *)dst;
-       for(i=0,j=0; j<num_pixels; i+=3,j++)
-       {
-               const int b= src[i+0];
-               const int g= src[i+1];
-               const int r= src[i+2];
-
-               d[j]= (b>>3) | ((g&0xF8)<<2) | ((r&0xF8)<<7);
-       }
-#endif
 }
 
-/**
- * Palette is assumed to contain bgr16, see rgb32to16 to convert the palette
- */
-void palette8torgb16(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
+void rgb16tobgr16(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
        unsigned i;
+       unsigned num_pixels = src_size >> 1;
+       
        for(i=0; i<num_pixels; i++)
-               ((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
+       {
+           unsigned b,g,r;
+           register uint16_t rgb;
+           rgb = src[2*i];
+           r = rgb&0x1F;
+           g = (rgb&0x7E0)>>5;
+           b = (rgb&0xF800)>>11;
+           dst[2*i] = (b&0x1F) | ((g&0x3F)<<5) | ((r&0x1F)<<11);
+       }
 }
 
-/**
- * Pallete is assumed to contain bgr15, see rgb32to15 to convert the palette
- */
-void palette8torgb15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
+void rgb16tobgr15(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
        unsigned i;
+       unsigned num_pixels = src_size >> 1;
+       
        for(i=0; i<num_pixels; i++)
-               ((uint16_t *)dst)[i] = ((uint16_t *)palette)[ src[i] ];
+       {
+           unsigned b,g,r;
+           register uint16_t rgb;
+           rgb = src[2*i];
+           r = rgb&0x1F;
+           g = (rgb&0x7E0)>>5;
+           b = (rgb&0xF800)>>11;
+           dst[2*i] = (b&0x1F) | ((g&0x1F)<<5) | ((r&0x1F)<<10);
+       }
 }
 
-void rgb32tobgr32(const uint8_t *src, uint8_t *dst, unsigned int src_size)
+void rgb15tobgr32(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
-       int num_pixels= src_size >> 2;
-#ifdef HAVE_MMX
-       asm volatile (
-               "xorl %%eax, %%eax              \n\t"
-               ".balign 16                     \n\t"
-               "1:                             \n\t"
-               PREFETCH" 32(%0, %%eax)         \n\t"
-               "movq (%0, %%eax), %%mm0        \n\t"
-               "movq %%mm0, %%mm1              \n\t"
-               "movq %%mm0, %%mm2              \n\t"
-               "pslld $16, %%mm0               \n\t"
-               "psrld $16, %%mm1               \n\t"
-               "pand mask32r, %%mm0            \n\t"
-               "pand mask32g, %%mm2            \n\t"
-               "pand mask32b, %%mm1            \n\t"
-               "por %%mm0, %%mm2               \n\t"
-               "por %%mm1, %%mm2               \n\t"
-               MOVNTQ" %%mm2, (%1, %%eax)      \n\t"
-               "addl $2, %%eax                 \n\t"
-               "cmpl %2, %%eax                 \n\t"
-               " jb 1b                         \n\t"
-               :: "r" (src), "r"(dst), "r" (num_pixels)
-               : "%eax"
-       );
-
-       __asm __volatile(SFENCE:::"memory");
-       __asm __volatile(EMMS:::"memory");
-#else
-       int i;
-       for(i=0; i<num_pixels; i++)
+       const uint16_t *end;
+       uint8_t *d = (uint8_t *)dst;
+       const uint16_t *s = (const uint16_t *)src;
+       end = s + src_size/2;
+       while(s < end)
        {
-               dst[4*i + 0] = src[4*i + 2];
-               dst[4*i + 1] = src[4*i + 1];
-               dst[4*i + 2] = src[4*i + 0];
+               register uint16_t bgr;
+               bgr = *s++;
+               *d++ = (bgr&0x7C00)>>7;
+               *d++ = (bgr&0x3E0)>>2;
+               *d++ = (bgr&0x1F)<<3;
+               *d++ = 0;
        }
-#endif
 }
 
-/**
- *
- * height should be a multiple of 2 and width should be a multiple of 16 (if this is a
- * problem for anyone then tell me, and ill fix it)
- */
-void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
-       unsigned int width, unsigned int height,
-       unsigned int lumStride, unsigned int chromStride, unsigned int dstStride)
+void rgb15tobgr24(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
-       int y;
-       const int chromWidth= width>>1;
-       for(y=0; y<height; y++)
+       const uint16_t *end;
+       uint8_t *d = (uint8_t *)dst;
+       const uint16_t *s = (uint16_t *)src;
+       end = s + src_size/2;
+       while(s < end)
        {
-#ifdef HAVE_MMX
-//FIXME handle 2 lines a once (fewer prefetch, reuse some chrom, but very likely limited by mem anyway)
-               asm volatile(
-                       "xorl %%eax, %%eax              \n\t"
-                       ".balign 16                     \n\t"
-                       "1:                             \n\t"
-                       PREFETCH" 32(%1, %%eax, 2)      \n\t"
-                       PREFETCH" 32(%2, %%eax)         \n\t"
-                       PREFETCH" 32(%3, %%eax)         \n\t"
-                       "movq (%2, %%eax), %%mm0        \n\t" // U(0)
-                       "movq %%mm0, %%mm2              \n\t" // U(0)
-                       "movq (%3, %%eax), %%mm1        \n\t" // V(0)
-                       "punpcklbw %%mm1, %%mm0         \n\t" // UVUV UVUV(0)
-                       "punpckhbw %%mm1, %%mm2         \n\t" // UVUV UVUV(8)
-
-                       "movq (%1, %%eax,2), %%mm3      \n\t" // Y(0)
-                       "movq 8(%1, %%eax,2), %%mm5     \n\t" // Y(8)
-                       "movq %%mm3, %%mm4              \n\t" // Y(0)
-                       "movq %%mm5, %%mm6              \n\t" // Y(8)
-                       "punpcklbw %%mm0, %%mm3         \n\t" // YUYV YUYV(0)
-                       "punpckhbw %%mm0, %%mm4         \n\t" // YUYV YUYV(4)
-                       "punpcklbw %%mm2, %%mm5         \n\t" // YUYV YUYV(8)
-                       "punpckhbw %%mm2, %%mm6         \n\t" // YUYV YUYV(12)
-
-                       MOVNTQ" %%mm3, (%0, %%eax, 4)   \n\t"
-                       MOVNTQ" %%mm4, 8(%0, %%eax, 4)  \n\t"
-                       MOVNTQ" %%mm5, 16(%0, %%eax, 4) \n\t"
-                       MOVNTQ" %%mm6, 24(%0, %%eax, 4) \n\t"
-
-                       "addl $8, %%eax                 \n\t"
-                       "cmpl %4, %%eax                 \n\t"
-                       " jb 1b                         \n\t"
-                       ::"r"(dst), "r"(ysrc), "r"(usrc), "r"(vsrc), "r" (chromWidth)
-                       : "%eax"
-               );
-#else
-               int i;
-               for(i=0; i<chromWidth; i++)
-               {
-                       dst[4*i+0] = ysrc[2*i+0];
-                       dst[4*i+1] = usrc[i];
-                       dst[4*i+2] = ysrc[2*i+1];
-                       dst[4*i+3] = vsrc[i];
-               }
-#endif
-               if(y&1)
-               {
-                       usrc += chromStride;
-                       vsrc += chromStride;
-               }
-               ysrc += lumStride;
-               dst += dstStride;
+               register uint16_t bgr;
+               bgr = *s++;
+               *d++ = (bgr&0x7C00)>>7;
+               *d++ = (bgr&0x3E0)>>2;
+               *d++ = (bgr&0x1F)<<3;
        }
-#ifdef HAVE_MMX
-asm(    EMMS" \n\t"
-        SFENCE" \n\t"
-        :::"memory");
-#endif
 }
 
-/**
- *
- * height should be a multiple of 2 and width should be a multiple of 16 (if this is a
- * problem for anyone then tell me, and ill fix it)
- */
-void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
-       unsigned int width, unsigned int height,
-       unsigned int lumStride, unsigned int chromStride, unsigned int srcStride)
+void rgb15tobgr16(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
-       int y;
-       const int chromWidth= width>>1;
-       for(y=0; y<height; y+=2)
+       unsigned i;
+       unsigned num_pixels = src_size >> 1;
+       
+       for(i=0; i<num_pixels; i++)
        {
-#ifdef HAVE_MMX
-               asm volatile(
-                       "xorl %%eax, %%eax              \n\t"
-                       "pcmpeqw %%mm7, %%mm7           \n\t"
-                       "psrlw $8, %%mm7                \n\t" // FF,00,FF,00...
-                       ".balign 16                     \n\t"
-                       "1:                             \n\t"
-                       PREFETCH" 64(%0, %%eax, 4)      \n\t"
-                       "movq (%0, %%eax, 4), %%mm0     \n\t" // YUYV YUYV(0)
-                       "movq 8(%0, %%eax, 4), %%mm1    \n\t" // YUYV YUYV(4)
-                       "movq %%mm0, %%mm2              \n\t" // YUYV YUYV(0)
-                       "movq %%mm1, %%mm3              \n\t" // YUYV YUYV(4)
-                       "psrlw $8, %%mm0                \n\t" // U0V0 U0V0(0)
-                       "psrlw $8, %%mm1                \n\t" // U0V0 U0V0(4)
-                       "pand %%mm7, %%mm2              \n\t" // Y0Y0 Y0Y0(0)
-                       "pand %%mm7, %%mm3              \n\t" // Y0Y0 Y0Y0(4)
-                       "packuswb %%mm1, %%mm0          \n\t" // UVUV UVUV(0)
-                       "packuswb %%mm3, %%mm2          \n\t" // YYYY YYYY(0)
-
-                       MOVNTQ" %%mm2, (%1, %%eax, 2)   \n\t"
-
-                       "movq 16(%0, %%eax, 4), %%mm1   \n\t" // YUYV YUYV(8)
-                       "movq 24(%0, %%eax, 4), %%mm2   \n\t" // YUYV YUYV(12)
-                       "movq %%mm1, %%mm3              \n\t" // YUYV YUYV(8)
-                       "movq %%mm2, %%mm4              \n\t" // YUYV YUYV(12)
-                       "psrlw $8, %%mm1                \n\t" // U0V0 U0V0(8)
-                       "psrlw $8, %%mm2                \n\t" // U0V0 U0V0(12)
-                       "pand %%mm7, %%mm3              \n\t" // Y0Y0 Y0Y0(8)
-                       "pand %%mm7, %%mm4              \n\t" // Y0Y0 Y0Y0(12)
-                       "packuswb %%mm2, %%mm1          \n\t" // UVUV UVUV(8)
-                       "packuswb %%mm4, %%mm3          \n\t" // YYYY YYYY(8)
-
-                       MOVNTQ" %%mm3, 8(%1, %%eax, 2)  \n\t"
-
-                       "movq %%mm0, %%mm2              \n\t" // UVUV UVUV(0)
-                       "movq %%mm1, %%mm3              \n\t" // UVUV UVUV(8)
-                       "psrlw $8, %%mm0                \n\t" // V0V0 V0V0(0)
-                       "psrlw $8, %%mm1                \n\t" // V0V0 V0V0(8)
-                       "pand %%mm7, %%mm2              \n\t" // U0U0 U0U0(0)
-                       "pand %%mm7, %%mm3              \n\t" // U0U0 U0U0(8)
-                       "packuswb %%mm1, %%mm0          \n\t" // VVVV VVVV(0)
-                       "packuswb %%mm3, %%mm2          \n\t" // UUUU UUUU(0)
-
-                       MOVNTQ" %%mm0, (%3, %%eax)      \n\t"
-                       MOVNTQ" %%mm2, (%2, %%eax)      \n\t"
-
-                       "addl $8, %%eax                 \n\t"
-                       "cmpl %4, %%eax                 \n\t"
-                       " jb 1b                         \n\t"
-                       ::"r"(src), "r"(ydst), "r"(udst), "r"(vdst), "r" (chromWidth)
-                       : "memory", "%eax"
-               );
-
-               ydst += lumStride;
-               src  += srcStride;
-
-               asm volatile(
-                       "xorl %%eax, %%eax              \n\t"
-                       ".balign 16                     \n\t"
-                       "1:                             \n\t"
-                       PREFETCH" 64(%0, %%eax, 4)      \n\t"
-                       "movq (%0, %%eax, 4), %%mm0     \n\t" // YUYV YUYV(0)
-                       "movq 8(%0, %%eax, 4), %%mm1    \n\t" // YUYV YUYV(4)
-                       "movq 16(%0, %%eax, 4), %%mm2   \n\t" // YUYV YUYV(8)
-                       "movq 24(%0, %%eax, 4), %%mm3   \n\t" // YUYV YUYV(12)
-                       "pand %%mm7, %%mm0              \n\t" // Y0Y0 Y0Y0(0)
-                       "pand %%mm7, %%mm1              \n\t" // Y0Y0 Y0Y0(4)
-                       "pand %%mm7, %%mm2              \n\t" // Y0Y0 Y0Y0(8)
-                       "pand %%mm7, %%mm3              \n\t" // Y0Y0 Y0Y0(12)
-                       "packuswb %%mm1, %%mm0          \n\t" // YYYY YYYY(0)
-                       "packuswb %%mm3, %%mm2          \n\t" // YYYY YYYY(8)
-
-                       MOVNTQ" %%mm0, (%1, %%eax, 2)   \n\t"
-                       MOVNTQ" %%mm2, 8(%1, %%eax, 2)  \n\t"
-
-                       "addl $8, %%eax                 \n\t"
-                       "cmpl %4, %%eax                 \n\t"
-                       " jb 1b                         \n\t"
-
-                       ::"r"(src), "r"(ydst), "r"(udst), "r"(vdst), "r" (chromWidth)
-                       : "memory", "%eax"
-               );
-#else
-               int i;
-               for(i=0; i<chromWidth; i++)
-               {
-                       ydst[2*i+0]     = src[4*i+0];
-                       udst[i]         = src[4*i+1];
-                       ydst[2*i+1]     = src[4*i+2];
-                       vdst[i]         = src[4*i+3];
-               }
-               ydst += lumStride;
-               src  += srcStride;
-
-               for(i=0; i<chromWidth; i++)
-               {
-                       ydst[2*i+0]     = src[4*i+0];
-                       ydst[2*i+1]     = src[4*i+2];
-               }
-#endif
-               udst += chromStride;
-               vdst += chromStride;
-               ydst += lumStride;
-               src  += srcStride;
+           unsigned b,g,r;
+           register uint16_t rgb;
+           rgb = src[2*i];
+           r = rgb&0x1F;
+           g = (rgb&0x3E0)>>5;
+           b = (rgb&0x7C00)>>10;
+           dst[2*i] = (b&0x1F) | ((g&0x3F)<<5) | ((r&0x1F)<<11);
        }
-#ifdef HAVE_MMX
-asm volatile(   EMMS" \n\t"
-               SFENCE" \n\t"
-               :::"memory");
-#endif
 }
 
-/**
- *
- * height should be a multiple of 2 and width should be a multiple of 16 (if this is a
- * problem for anyone then tell me, and ill fix it)
- */
-void uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
-       unsigned int width, unsigned int height,
-       unsigned int lumStride, unsigned int chromStride, unsigned int srcStride)
+void rgb15tobgr15(const uint8_t *src, uint8_t *dst, unsigned int src_size)
 {
-       int y;
-       const int chromWidth= width>>1;
-       for(y=0; y<height; y+=2)
+       unsigned i;
+       unsigned num_pixels = src_size >> 1;
+       
+       for(i=0; i<num_pixels; i++)
        {
-#ifdef HAVE_MMX
-               asm volatile(
-                       "xorl %%eax, %%eax              \n\t"
-                       "pcmpeqw %%mm7, %%mm7           \n\t"
-                       "psrlw $8, %%mm7                \n\t" // FF,00,FF,00...
-                       ".balign 16                     \n\t"
-                       "1:                             \n\t"
-                       PREFETCH" 64(%0, %%eax, 4)      \n\t"
-                       "movq (%0, %%eax, 4), %%mm0     \n\t" // UYVY UYVY(0)
-                       "movq 8(%0, %%eax, 4), %%mm1    \n\t" // UYVY UYVY(4)
-                       "movq %%mm0, %%mm2              \n\t" // UYVY UYVY(0)
-                       "movq %%mm1, %%mm3              \n\t" // UYVY UYVY(4)
-                       "pand %%mm7, %%mm0              \n\t" // U0V0 U0V0(0)
-                       "pand %%mm7, %%mm1              \n\t" // U0V0 U0V0(4)
-                       "psrlw $8, %%mm2                \n\t" // Y0Y0 Y0Y0(0)
-                       "psrlw $8, %%mm3                \n\t" // Y0Y0 Y0Y0(4)
-                       "packuswb %%mm1, %%mm0          \n\t" // UVUV UVUV(0)
-                       "packuswb %%mm3, %%mm2          \n\t" // YYYY YYYY(0)
-
-                       MOVNTQ" %%mm2, (%1, %%eax, 2)   \n\t"
-
-                       "movq 16(%0, %%eax, 4), %%mm1   \n\t" // UYVY UYVY(8)
-                       "movq 24(%0, %%eax, 4), %%mm2   \n\t" // UYVY UYVY(12)
-                       "movq %%mm1, %%mm3              \n\t" // UYVY UYVY(8)
-                       "movq %%mm2, %%mm4              \n\t" // UYVY UYVY(12)
-                       "pand %%mm7, %%mm1              \n\t" // U0V0 U0V0(8)
-                       "pand %%mm7, %%mm2              \n\t" // U0V0 U0V0(12)
-                       "psrlw $8, %%mm3                \n\t" // Y0Y0 Y0Y0(8)
-                       "psrlw $8, %%mm4                \n\t" // Y0Y0 Y0Y0(12)
-                       "packuswb %%mm2, %%mm1          \n\t" // UVUV UVUV(8)
-                       "packuswb %%mm4, %%mm3          \n\t" // YYYY YYYY(8)
-
-                       MOVNTQ" %%mm3, 8(%1, %%eax, 2)  \n\t"
-
-                       "movq %%mm0, %%mm2              \n\t" // UVUV UVUV(0)
-                       "movq %%mm1, %%mm3              \n\t" // UVUV UVUV(8)
-                       "psrlw $8, %%mm0                \n\t" // V0V0 V0V0(0)
-                       "psrlw $8, %%mm1                \n\t" // V0V0 V0V0(8)
-                       "pand %%mm7, %%mm2              \n\t" // U0U0 U0U0(0)
-                       "pand %%mm7, %%mm3              \n\t" // U0U0 U0U0(8)
-                       "packuswb %%mm1, %%mm0          \n\t" // VVVV VVVV(0)
-                       "packuswb %%mm3, %%mm2          \n\t" // UUUU UUUU(0)
-
-                       MOVNTQ" %%mm0, (%3, %%eax)      \n\t"
-                       MOVNTQ" %%mm2, (%2, %%eax)      \n\t"
-
-                       "addl $8, %%eax                 \n\t"
-                       "cmpl %4, %%eax                 \n\t"
-                       " jb 1b                         \n\t"
-                       ::"r"(src), "r"(ydst), "r"(udst), "r"(vdst), "r" (chromWidth)
-                       : "memory", "%eax"
-               );
-
-               ydst += lumStride;
-               src  += srcStride;
-
-               asm volatile(
-                       "xorl %%eax, %%eax              \n\t"
-                       ".balign 16                     \n\t"
-                       "1:                             \n\t"
-                       PREFETCH" 64(%0, %%eax, 4)      \n\t"
-                       "movq (%0, %%eax, 4), %%mm0     \n\t" // YUYV YUYV(0)
-                       "movq 8(%0, %%eax, 4), %%mm1    \n\t" // YUYV YUYV(4)
-                       "movq 16(%0, %%eax, 4), %%mm2   \n\t" // YUYV YUYV(8)
-                       "movq 24(%0, %%eax, 4), %%mm3   \n\t" // YUYV YUYV(12)
-                       "psrlw $8, %%mm0                \n\t" // Y0Y0 Y0Y0(0)
-                       "psrlw $8, %%mm1                \n\t" // Y0Y0 Y0Y0(4)
-                       "psrlw $8, %%mm2                \n\t" // Y0Y0 Y0Y0(8)
-                       "psrlw $8, %%mm3                \n\t" // Y0Y0 Y0Y0(12)
-                       "packuswb %%mm1, %%mm0          \n\t" // YYYY YYYY(0)
-                       "packuswb %%mm3, %%mm2          \n\t" // YYYY YYYY(8)
-
-                       MOVNTQ" %%mm0, (%1, %%eax, 2)   \n\t"
-                       MOVNTQ" %%mm2, 8(%1, %%eax, 2)  \n\t"
-
-                       "addl $8, %%eax                 \n\t"
-                       "cmpl %4, %%eax                 \n\t"
-                       " jb 1b                         \n\t"
-
-                       ::"r"(src), "r"(ydst), "r"(udst), "r"(vdst), "r" (chromWidth)
-                       : "memory", "%eax"
-               );
-#else
-               int i;
-               for(i=0; i<chromWidth; i++)
-               {
-                       udst[i]         = src[4*i+0];
-                       ydst[2*i+0]     = src[4*i+1];
-                       vdst[i]         = src[4*i+2];
-                       ydst[2*i+1]     = src[4*i+3];
-               }
-               ydst += lumStride;
-               src  += srcStride;
-
-               for(i=0; i<chromWidth; i++)
-               {
-                       ydst[2*i+0]     = src[4*i+1];
-                       ydst[2*i+1]     = src[4*i+3];
-               }
-#endif
-               udst += chromStride;
-               vdst += chromStride;
-               ydst += lumStride;
-               src  += srcStride;
+           unsigned b,g,r;
+           register uint16_t rgb;
+           rgb = src[2*i];
+           r = rgb&0x1F;
+           g = (rgb&0x3E0)>>5;
+           b = (rgb&0x7C00)>>10;
+           dst[2*i] = (b&0x1F) | ((g&0x1F)<<5) | ((r&0x1F)<<10);
        }
-#ifdef HAVE_MMX
-asm volatile(   EMMS" \n\t"
-               SFENCE" \n\t"
-               :::"memory");
-#endif
 }
 
-
+void rgb8tobgr8(const uint8_t *src, uint8_t *dst, unsigned int src_size)
+{
+       unsigned i;
+       unsigned num_pixels = src_size;
+       for(i=0; i<num_pixels; i++)
+       {
+           unsigned b,g,r;
+           register uint8_t rgb;
+           rgb = src[i];
+           r = (rgb&0x07);
+           g = (rgb&0x38)>>3;
+           b = (rgb&0xC0)>>6;
+           dst[i] = ((b<<1)&0x07) | ((g&0x07)<<3) | ((r&0x03)<<6);
+       }
+}