[Mplayer-cvslog] CVS: main/postproc rgb2rgb.c,1.52,1.53

[Alex Beregszaszi]

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

Modified Files:
	rgb2rgb.c 
Log Message:
added missing palette8tobgr pairs (hope it's correct)

Index: rgb2rgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- rgb2rgb.c	30 Jun 2002 19:04:02 -0000	1.52
+++ rgb2rgb.c	30 Aug 2002 11:17:15 -0000	1.53
@@ -12,6 +12,7 @@
 #include "rgb2rgb.h"
 #include "../cpudetect.h"
 #include "../mangle.h"
+#include "../bswap.h"
 
 #ifdef ARCH_X86
 #define CAN_COMPILE_X86_ASM
@@ -268,6 +269,29 @@
 		((unsigned *)dst)[i] = ((unsigned *)palette)[ src[i] ];
 }
 
+#if 0
+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++)
+	{
+		//FIXME slow?
+		dst[0]= palette[ src[i]*4+3 ];
+		dst[1]= palette[ src[i]*4+2 ];
+		dst[2]= palette[ src[i]*4+1 ];
+		dst[3]= palette[ src[i]*4+0 ];
+		dst+= 4;
+	}
+}
+#else
+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++)
+		((unsigned *)dst)[i] = bswap_32(((unsigned *)palette)[ src[i] ]);
+}
+#endif
+
 /**
  * Pallete is assumed to contain bgr32
  */
@@ -289,6 +313,24 @@
 	}
 }
 
+void palette8tobgr24(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette)
+{
+	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++)
+	{
+		//FIXME slow?
+		dst[0]= palette[ src[i]*4+3 ];
+		dst[1]= palette[ src[i]*4+2 ];
+		dst[2]= palette[ src[i]*4+1 ];
+		dst+= 3;
+	}
+}
+
 void bgr24torgb24(const uint8_t *src, uint8_t *dst, unsigned src_size)
 {
 #ifdef CAN_COMPILE_X86_ASM
@@ -375,6 +417,12 @@
 	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] ]);
+}
 
 /**
  * Pallete is assumed to contain bgr15, see rgb32to15 to convert the palette
@@ -384,6 +432,12 @@
 	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] ]);
 }
 
 void rgb32tobgr32(const uint8_t *src, uint8_t *dst, unsigned int src_size)