Change unsigned->signed and int->long, this fits the asm code better on 64

bit systems.
Also fixes several crashes because (long)-i is incorrect if i is unsigned.

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

1 files changed, 60 insertions, 59 deletions

diff --git a/postproc/rgb2rgb.h b/postproc/rgb2rgb.h
index 78d43d2a01..e38893deaf 100644
--- a/postproc/rgb2rgb.h
+++ b/postproc/rgb2rgb.h
@@ -12,46 +12,46 @@
 // Note: do not fix the dependence on stdio.h
 
 /* 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 (*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 rgb32tobgr24(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);
-extern void rgb16tobgr15(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb15tobgr32(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb15tobgr24(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb15tobgr16(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb15tobgr15(const uint8_t *src, uint8_t *dst, unsigned src_size);
-extern void rgb8tobgr8(const uint8_t *src, uint8_t *dst, unsigned src_size);
-
-
-extern void palette8torgb32(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
-extern void palette8tobgr32(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
-extern void palette8torgb24(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
-extern void palette8tobgr24(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
-extern void palette8torgb16(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
-extern void palette8tobgr16(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
-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 (*rgb24to32)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb24to16)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb24to15)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb32to24)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb32to16)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb32to15)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb15to16)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb15to24)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb15to32)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb16to15)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb16to24)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb16to32)(const uint8_t *src,uint8_t *dst,long src_size);
+extern void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
+extern void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
+extern void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
+extern void (*rgb32tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);
+extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
+extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
+
+extern void rgb24tobgr32(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb32tobgr24(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb16tobgr32(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb16tobgr24(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb16tobgr16(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb16tobgr15(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb15tobgr32(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb15tobgr24(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb15tobgr16(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb15tobgr15(const uint8_t *src, uint8_t *dst, long src_size);
+extern void rgb8tobgr8(const uint8_t *src, uint8_t *dst, long src_size);
+
+
+extern void palette8torgb32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+extern void palette8tobgr32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+extern void palette8torgb24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+extern void palette8tobgr24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+extern void palette8torgb16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+extern void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+extern void palette8torgb15(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
+extern void palette8tobgr15(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
 
 /**
  *
@@ -67,16 +67,16 @@ extern void palette8tobgr15(const uint8_t *src, uint8_t *dst, unsigned num_pixel
  * 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);
+	long width, long height,
+	long lumStride, long chromStride, long dstStride);
 
 /**
  *
  * 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);
+	long width, long height,
+	long lumStride, long chromStride, long dstStride);
 
 /**
  *
@@ -84,8 +84,8 @@ extern void (*yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uin
  * 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);
+	long width, long height,
+	long lumStride, long chromStride, long srcStride);
 
 /**
  *
@@ -93,8 +93,8 @@ extern void (*yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint
  * problem for anyone then tell me, and ill fix it)
  */
 extern 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);
+	long width, long height,
+	long lumStride, long chromStride, long dstStride);
 
 /**
  *
@@ -103,25 +103,26 @@ extern void (*yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_
  * 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);
+	long width, long height,
+	long lumStride, long chromStride, long srcStride);
+extern void (*planar2x)(const uint8_t *src, uint8_t *dst, long width, long height,
+	long srcStride, long dstStride);
 
 extern void (*interleaveBytes)(uint8_t *src1, uint8_t *src2, uint8_t *dst,
-			    unsigned width, unsigned height, int src1Stride,
-			    int src2Stride, int dstStride);
+			    long width, long height, long src1Stride,
+			    long src2Stride, long dstStride);
 
 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);
+			long width, long height,
+			long srcStride1, long srcStride2,
+			long dstStride1, long dstStride2);
 
 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,
-			int srcStride3, int dstStride);
+			long width, long height,
+			long srcStride1, long srcStride2,
+			long srcStride3, long dstStride);
 	
 
 #define MODE_RGB  0x1