remove remaining cpudetect dependancy

Originally committed as revision 9988 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

1 files changed, 58 insertions, 26 deletions

diff --git a/postproc/rgb2rgb.h b/postproc/rgb2rgb.h
index c74a197bfa..fe7d98a1cd 100644
--- a/postproc/rgb2rgb.h
+++ b/postproc/rgb2rgb.h
@@ -10,26 +10,27 @@
 #define RGB2RGB_INCLUDED
 
 /* A full collection of rgb to rgb(bgr) convertors */
-extern void rgb24to32(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb24to16(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb24to15(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb32to24(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb32to16(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb32to15(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb15to16(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb15to24(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb15to32(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb16to15(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb16to24(const uint8_t *src,uint8_t *dst,unsigned src_size);
-extern void rgb16to32(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb24to32)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb24to16)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb24to15)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb32to24)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb32to16)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb32to15)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb15to16)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb15to24)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb15to32)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb16to15)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb16to24)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb16to32)(const uint8_t *src,uint8_t *dst,unsigned src_size);
+extern void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+extern void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+extern void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+extern void (*rgb32tobgr32)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, unsigned src_size);
+
 extern void rgb24tobgr32(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb24tobgr24(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb24tobgr16(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb24tobgr15(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb32tobgr32(const uint8_t *src, uint8_t *dst, unsigned src_size);
 extern void rgb32tobgr24(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb32tobgr16(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb32tobgr15(const uint8_t *src, uint8_t *dst, unsigned src_size);
 extern void rgb16tobgr32(const uint8_t *src, uint8_t *dst, unsigned src_size);
 extern void rgb16tobgr24(const uint8_t *src, uint8_t *dst, unsigned src_size);
 extern void rgb16tobgr16(const uint8_t *src, uint8_t *dst, unsigned src_size);
@@ -50,31 +51,62 @@ extern void palette8tobgr16(const uint8_t *src, uint8_t *dst, unsigned num_pixel
 extern void palette8torgb15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
 extern void palette8tobgr15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
 
-extern void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
+/**
+ *
+ * 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)
+ * chrominance data is only taken from every secound line others are ignored FIXME write HQ version
+ */
+//void uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
+
+/**
+ *
+ * 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)
+ */
+extern 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);
-extern void yuv422ptoyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
+
+/**
+ *
+ * width should be a multiple of 16
+ */
+extern 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);
-extern void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
+
+/**
+ *
+ * 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)
+ */
+extern 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);
-extern void rgb24toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
+
+/**
+ *
+ * height should be a multiple of 2 and width should be a multiple of 2 (if this is a
+ * problem for anyone then tell me, and ill fix it)
+ * chrominance data is only taken from every secound line others are ignored FIXME write HQ version
+ */
+extern 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);
-extern void planar2x(const uint8_t *src, uint8_t *dst, int width, int height, int srcStride, int dstStride);
+extern void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height, int srcStride, int dstStride);
 
-extern void interleaveBytes(uint8_t *src1, uint8_t *src2, uint8_t *dst,
+extern void (*interleaveBytes)(uint8_t *src1, uint8_t *src2, uint8_t *dst,
 			    unsigned width, unsigned height, int src1Stride,
 			    int src2Stride, int dstStride);
 
-extern void vu9_to_vu12(const uint8_t *src1, const uint8_t *src2,
+extern 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);
 
-extern void yvu9_to_yuy2(const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
+extern 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,