[Mplayer-cvslog] CVS: main/postproc rgb2rgb.c,1.2,1.3 rgb2rgb.h,1.2,1.3

[Nick Kurshev]

Update of /cvsroot/mplayer/main/postproc
In directory mplayer:/var/tmp.root/cvs-serv18822/main/postproc

Modified Files:
	rgb2rgb.c rgb2rgb.h 
Log Message:
vo_vesa: more rgb2rgb support

Index: rgb2rgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rgb2rgb.c	28 Oct 2001 10:28:08 -0000	1.2
+++ rgb2rgb.c	28 Oct 2001 10:45:42 -0000	1.3
@@ -1,6 +1,7 @@
 #include <inttypes.h>
 #include "../config.h"
 #include "rgb2rgb.h"
+#include "mmx.h"
 
 /* TODO: MMX optimization */
 
@@ -32,4 +33,56 @@
     *dest++ = *s++;
     s++;
   }
+}
+
+/* Original by Strepto/Astral
+ ported to gcc & bugfixed : A'rpi */
+void rgb15to16(uint8_t *src,uint8_t *dst,uint32_t src_size)
+{
+#ifdef HAVE_MMX
+  static uint64_t mask_b  = 0x001F001F001F001FLL; // 00000000 00011111  xxB
+  static uint64_t mask_rg = 0x7FE07FE07FE07FE0LL; // 01111111 11100000  RGx
+  register char* s=src+src_size;
+  register char* d=dst+src_size;
+  register int offs=-src_size;
+  movq_m2r (mask_b,  mm4);
+  movq_m2r (mask_rg, mm5);
+  while(offs<0){
+    movq_m2r (*(s+offs), mm0);
+    movq_r2r (mm0, mm1);
+
+    movq_m2r (*(s+8+offs), mm2);
+    movq_r2r (mm2, mm3);
+    
+    pand_r2r (mm4, mm0);
+    pand_r2r (mm5, mm1);
+    
+    psllq_i2r(1,mm1);
+    pand_r2r (mm4, mm2);
+
+    pand_r2r (mm5, mm3);
+    por_r2r  (mm1, mm0);
+
+    psllq_i2r(1,mm3);
+    movq_r2m (mm0,*(d+offs));
+
+    por_r2r  (mm3,mm2);
+    movq_r2m (mm2,*(d+8+offs));
+
+    offs+=16;
+  }
+  emms();
+#else
+   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 );
+   }
+#endif
 }

Index: rgb2rgb.h
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rgb2rgb.h	28 Oct 2001 10:28:08 -0000	1.2
+++ rgb2rgb.h	28 Oct 2001 10:45:42 -0000	1.3
@@ -1,6 +1,6 @@
 /* 
  *
- *  rgb2rgb.h, Software RGB to RGB converter
+ *  rgb2rgb.h, Software RGB to RGB convertor
  *
  */
 
@@ -9,5 +9,6 @@
 
 extern void rgb24to32(uint8_t *src,uint8_t *dst,uint32_t src_size);
 extern void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size);
+extern void rgb15to16(uint8_t *src,uint8_t *dst,uint32_t src_size);
 
 #endif