1. ffmpeg
  2. Commit b8e893399ff8755721dc117695ec5ff183c1e07b
Browse code

sws: replace all long with int.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

Anton Khirnov authored on 2011/05/27 01:57:26
Showing 15 changed files
libswscale/bfin/internal_bfin.S
History View file @ b8e8933
... ... 
@@ -466,8 +466,8 @@ DEFUN_END(yuv2rgb24_line)
466 466 
 #define ARG_srcStride   40
467 467
468 468 
 DEFUN(uyvytoyv12, mL3,  (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
469 
-                         long width, long height,
470 
-                         long lumStride, long chromStride, long srcStride)):
469 
+                         int width, int height,
470 
+                         int lumStride, int chromStride, int srcStride)):
471 471 
         link 0;
472 472 
         [--sp] = (r7:4,p5:4);
473 473
... ... 
@@ -539,8 +539,8 @@ DEFUN(uyvytoyv12, mL3,  (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8
539 539 
 DEFUN_END(uyvytoyv12)
540 540
541 541 
 DEFUN(yuyvtoyv12, mL3,  (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
542 
-                         long width, long height,
543 
-                         long lumStride, long chromStride, long srcStride)):
542 
+                         int width, int height,
543 
+                         int lumStride, int chromStride, int srcStride)):
544 544 
         link 0;
545 545 
         [--sp] = (r7:4,p5:4);
546 546
libswscale/bfin/swscale_bfin.c
History View file @ b8e8933
... ... 
@@ -38,12 +38,12 @@
38 38 
 #endif
39 39
40 40 
 int ff_bfin_uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
41 
-                       long width, long height,
42 
-                       long lumStride, long chromStride, long srcStride) L1CODE;
41 
+                       int width, int height,
42 
+                       int lumStride, int chromStride, int srcStride) L1CODE;
43 43
44 44 
 int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
45 
-                       long width, long height,
46 
-                       long lumStride, long chromStride, long srcStride) L1CODE;
45 
+                       int width, int height,
46 
+                       int lumStride, int chromStride, int srcStride) L1CODE;
47 47
48 48 
 static int uyvytoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
49 49 
                                int srcSliceH, uint8_t* dst[], int dstStride[])
libswscale/colorspace-test.c
History View file @ b8e8933
... ... 
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
52 52 
             int src_bpp;
53 53 
             int dst_bpp;
54 54 
             const char *name;
55 
-            void (*func)(const uint8_t *src, uint8_t *dst, long src_size);
55 
+            void (*func)(const uint8_t *src, uint8_t *dst, int src_size);
56 56 
         } func_info[] = {
57 57 
             FUNC(2, 2, rgb15to16),
58 58 
             FUNC(2, 3, rgb15to24),
libswscale/ppc/swscale_altivec_template.c
History View file @ b8e8933
... ... 
@@ -29,13 +29,13 @@ altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW)
29 29 
     register int i;
30 30 
     vector unsigned int altivec_vectorShiftInt19 =
31 31 
         vec_add(vec_splat_u32(10), vec_splat_u32(9));
32 
-    if ((unsigned long)dest % 16) {
32 
+    if ((unsigned int)dest % 16) {
33 33 
         /* badly aligned store, we force store alignment */
34 34 
         /* and will handle load misalignment on val w/ vec_perm */
35 35 
         vector unsigned char perm1;
36 36 
         vector signed int v1;
37 37 
         for (i = 0 ; (i < dstW) &&
38 
-            (((unsigned long)dest + i) % 16) ; i++) {
38 
+            (((unsigned int)dest + i) % 16) ; i++) {
39 39 
                 int t = val[i] >> 19;
40 40 
                 dest[i] = (t < 0) ? 0 : ((t > 255) ? 255 : t);
41 41 
         }
libswscale/ppc/swscale_template.c
History View file @ b8e8933
... ... 
@@ -30,7 +30,7 @@ static inline void RENAME(yuv2yuvX)(SwsContext *c, const int16_t *lumFilter,
30 30 
                                     const int16_t **chrVSrc, int chrFilterSize,
31 31 
                                     const int16_t **alpSrc,
32 32 
                                     uint8_t *dest, uint8_t *uDest, uint8_t *vDest,
33 
-                                    uint8_t *aDest, long dstW, long chrDstW)
33 
+                                    uint8_t *aDest, int dstW, int chrDstW)
34 34 
 {
35 35 
     yuv2yuvX_altivec_real(lumFilter, lumSrc, lumFilterSize,
36 36 
                           chrFilter, chrUSrc, chrVSrc, chrFilterSize,
... ... 
@@ -45,7 +45,7 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, const int16_t *lumFilter,
45 45 
                                        const int16_t *chrFilter, const int16_t **chrUSrc,
46 46 
                                        const int16_t **chrVSrc, int chrFilterSize,
47 47 
                                        const int16_t **alpSrc, uint8_t *dest,
48 
-                                       long dstW, long dstY)
48 
+                                       int dstW, int dstY)
49 49 
 {
50 50 
     /* The following list of supported dstFormat values should
51 51 
        match what's found in the body of ff_yuv2packedX_altivec() */
libswscale/ppc/yuv2rgb_altivec.c
History View file @ b8e8933
... ... 
@@ -793,7 +793,7 @@ ff_yuv2packedX_altivec(SwsContext *c, const int16_t *lumFilter,
793 793
794 794 
     vector signed short   RND = vec_splat_s16(1<<3);
795 795 
     vector unsigned short SCL = vec_splat_u16(4);
796 
-    DECLARE_ALIGNED(16, unsigned long, scratch)[16];
796 
+    DECLARE_ALIGNED(16, unsigned int, scratch)[16];
797 797
798 798 
     vector signed short *YCoeffs, *CCoeffs;
799 799
libswscale/rgb2rgb.c
History View file @ b8e8933
... ... 
@@ -29,70 +29,70 @@
29 29 
 #include "swscale.h"
30 30 
 #include "swscale_internal.h"
31 31
32 
-void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);
33 
-void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
34 
-void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
35 
-void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
36 
-void (*rgb32to16)(const uint8_t *src, uint8_t *dst, long src_size);
37 
-void (*rgb32to15)(const uint8_t *src, uint8_t *dst, long src_size);
38 
-void (*rgb15to16)(const uint8_t *src, uint8_t *dst, long src_size);
39 
-void (*rgb15tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
40 
-void (*rgb15to32)(const uint8_t *src, uint8_t *dst, long src_size);
41 
-void (*rgb16to15)(const uint8_t *src, uint8_t *dst, long src_size);
42 
-void (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
43 
-void (*rgb16to32)(const uint8_t *src, uint8_t *dst, long src_size);
44 
-void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
45 
-void (*rgb24to16)(const uint8_t *src, uint8_t *dst, long src_size);
46 
-void (*rgb24to15)(const uint8_t *src, uint8_t *dst, long src_size);
47 
-void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, long src_size);
48 
-void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
49 
-void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
32 
+void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size);
33 
+void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
34 
+void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
35 
+void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
36 
+void (*rgb32to16)(const uint8_t *src, uint8_t *dst, int src_size);
37 
+void (*rgb32to15)(const uint8_t *src, uint8_t *dst, int src_size);
38 
+void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
39 
+void (*rgb15tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
40 
+void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
41 
+void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int src_size);
42 
+void (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
43 
+void (*rgb16to32)(const uint8_t *src, uint8_t *dst, int src_size);
44 
+void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
45 
+void (*rgb24to16)(const uint8_t *src, uint8_t *dst, int src_size);
46 
+void (*rgb24to15)(const uint8_t *src, uint8_t *dst, int src_size);
47 
+void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
48 
+void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
49 
+void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
50 50
51 51 
 void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
52 
-                   long width, long height,
53 
-                   long lumStride, long chromStride, long dstStride);
52 
+                   int width, int height,
53 
+                   int lumStride, int chromStride, int dstStride);
54 54 
 void (*yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
55 
-                   long width, long height,
56 
-                   long lumStride, long chromStride, long dstStride);
55 
+                   int width, int height,
56 
+                   int lumStride, int chromStride, int dstStride);
57 57 
 void (*yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
58 
-                      long width, long height,
59 
-                      long lumStride, long chromStride, long dstStride);
58 
+                      int width, int height,
59 
+                      int lumStride, int chromStride, int dstStride);
60 60 
 void (*yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
61 
-                      long width, long height,
62 
-                      long lumStride, long chromStride, long dstStride);
61 
+                      int width, int height,
62 
+                      int lumStride, int chromStride, int dstStride);
63 63 
 void (*yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
64 
-                   long width, long height,
65 
-                   long lumStride, long chromStride, long srcStride);
64 
+                   int width, int height,
65 
+                   int lumStride, int chromStride, int srcStride);
66 66 
 void (*rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
67 
-                    long width, long height,
68 
-                    long lumStride, long chromStride, long srcStride);
69 
-void (*planar2x)(const uint8_t *src, uint8_t *dst, long width, long height,
70 
-                 long srcStride, long dstStride);
67 
+                    int width, int height,
68 
+                    int lumStride, int chromStride, int srcStride);
69 
+void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height,
70 
+                 int srcStride, int dstStride);
71 71 
 void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst,
72 
-                        long width, long height, long src1Stride,
73 
-                        long src2Stride, long dstStride);
72 
+                        int width, int height, int src1Stride,
73 
+                        int src2Stride, int dstStride);
74 74 
 void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
75 75 
                     uint8_t *dst1, uint8_t *dst2,
76 
-                    long width, long height,
77 
-                    long srcStride1, long srcStride2,
78 
-                    long dstStride1, long dstStride2);
76 
+                    int width, int height,
77 
+                    int srcStride1, int srcStride2,
78 
+                    int dstStride1, int dstStride2);
79 79 
 void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
80 80 
                      uint8_t *dst,
81 
-                     long width, long height,
82 
-                     long srcStride1, long srcStride2,
83 
-                     long srcStride3, long dstStride);
81 
+                     int width, int height,
82 
+                     int srcStride1, int srcStride2,
83 
+                     int srcStride3, int dstStride);
84 84 
 void (*uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
85 
-                     long width, long height,
86 
-                     long lumStride, long chromStride, long srcStride);
85 
+                     int width, int height,
86 
+                     int lumStride, int chromStride, int srcStride);
87 87 
 void (*uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
88 
-                     long width, long height,
89 
-                     long lumStride, long chromStride, long srcStride);
88 
+                     int width, int height,
89 
+                     int lumStride, int chromStride, int srcStride);
90 90 
 void (*yuyvtoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
91 
-                     long width, long height,
92 
-                     long lumStride, long chromStride, long srcStride);
91 
+                     int width, int height,
92 
+                     int lumStride, int chromStride, int srcStride);
93 93 
 void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
94 
-                     long width, long height,
95 
-                     long lumStride, long chromStride, long srcStride);
94 
+                     int width, int height,
95 
+                     int lumStride, int chromStride, int srcStride);
96 96
97 97 
 #define RGB2YUV_SHIFT 8
98 98 
 #define BY ((int)( 0.098*(1<<RGB2YUV_SHIFT)+0.5))
... ... 
@@ -123,10 +123,10 @@ void sws_rgb2rgb_init(void)
123 123 
         rgb2rgb_init_x86();
124 124 
 }
125 125
126 
-void rgb32to24(const uint8_t *src, uint8_t *dst, long src_size)
126 
+void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size)
127 127 
 {
128 
-    long i;
129 
-    long num_pixels = src_size >> 2;
128 
+    int i;
129 
+    int num_pixels = src_size >> 2;
130 130 
     for (i=0; i<num_pixels; i++) {
131 131 
 #if HAVE_BIGENDIAN
132 132 
         /* RGB32 (= A,B,G,R) -> BGR24 (= B,G,R) */
... ... 
@@ -141,9 +141,9 @@ void rgb32to24(const uint8_t *src, uint8_t *dst, long src_size)
141 141 
     }
142 142 
 }
143 143
144 
-void rgb24to32(const uint8_t *src, uint8_t *dst, long src_size)
144 
+void rgb24to32(const uint8_t *src, uint8_t *dst, int src_size)
145 145 
 {
146 
-    long i;
146 
+    int i;
147 147 
     for (i=0; 3*i<src_size; i++) {
148 148 
 #if HAVE_BIGENDIAN
149 149 
         /* RGB24 (= R,G,B) -> BGR32 (= A,R,G,B) */
... ... 
@@ -160,7 +160,7 @@ void rgb24to32(const uint8_t *src, uint8_t *dst, long src_size)
160 160 
     }
161 161 
 }
162 162
163 
-void rgb16tobgr32(const uint8_t *src, uint8_t *dst, long src_size)
163 
+void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
164 164 
 {
165 165 
     const uint16_t *end;
166 166 
     uint8_t *d = dst;
... ... 
@@ -183,7 +183,7 @@ void rgb16tobgr32(const uint8_t *src, uint8_t *dst, long src_size)
183 183 
     }
184 184 
 }
185 185
186 
-void rgb16to24(const uint8_t *src, uint8_t *dst, long src_size)
186 
+void rgb16to24(const uint8_t *src, uint8_t *dst, int src_size)
187 187 
 {
188 188 
     const uint16_t *end;
189 189 
     uint8_t *d = dst;
... ... 
@@ -198,10 +198,10 @@ void rgb16to24(const uint8_t *src, uint8_t *dst, long src_size)
198 198 
     }
199 199 
 }
200 200
201 
-void rgb16tobgr16(const uint8_t *src, uint8_t *dst, long src_size)
201 
+void rgb16tobgr16(const uint8_t *src, uint8_t *dst, int src_size)
202 202 
 {
203 
-    long i;
204 
-    long num_pixels = src_size >> 1;
203 
+    int i;
204 
+    int num_pixels = src_size >> 1;
205 205
206 206 
     for (i=0; i<num_pixels; i++) {
207 207 
         unsigned rgb = ((const uint16_t*)src)[i];
... ... 
@@ -209,10 +209,10 @@ void rgb16tobgr16(const uint8_t *src, uint8_t *dst, long src_size)
209 209 
     }
210 210 
 }
211 211
212 
-void rgb16tobgr15(const uint8_t *src, uint8_t *dst, long src_size)
212 
+void rgb16tobgr15(const uint8_t *src, uint8_t *dst, int src_size)
213 213 
 {
214 
-    long i;
215 
-    long num_pixels = src_size >> 1;
214 
+    int i;
215 
+    int num_pixels = src_size >> 1;
216 216
217 217 
     for (i=0; i<num_pixels; i++) {
218 218 
         unsigned rgb = ((const uint16_t*)src)[i];
... ... 
@@ -220,7 +220,7 @@ void rgb16tobgr15(const uint8_t *src, uint8_t *dst, long src_size)
220 220 
     }
221 221 
 }
222 222
223 
-void rgb15tobgr32(const uint8_t *src, uint8_t *dst, long src_size)
223 
+void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
224 224 
 {
225 225 
     const uint16_t *end;
226 226 
     uint8_t *d = dst;
... ... 
@@ -243,7 +243,7 @@ void rgb15tobgr32(const uint8_t *src, uint8_t *dst, long src_size)
243 243 
     }
244 244 
 }
245 245
246 
-void rgb15to24(const uint8_t *src, uint8_t *dst, long src_size)
246 
+void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size)
247 247 
 {
248 248 
     const uint16_t *end;
249 249 
     uint8_t *d = dst;
... ... 
@@ -258,10 +258,10 @@ void rgb15to24(const uint8_t *src, uint8_t *dst, long src_size)
258 258 
     }
259 259 
 }
260 260
261 
-void rgb15tobgr16(const uint8_t *src, uint8_t *dst, long src_size)
261 
+void rgb15tobgr16(const uint8_t *src, uint8_t *dst, int src_size)
262 262 
 {
263 
-    long i;
264 
-    long num_pixels = src_size >> 1;
263 
+    int i;
264 
+    int num_pixels = src_size >> 1;
265 265
266 266 
     for (i=0; i<num_pixels; i++) {
267 267 
         unsigned rgb = ((const uint16_t*)src)[i];
... ... 
@@ -269,10 +269,10 @@ void rgb15tobgr16(const uint8_t *src, uint8_t *dst, long src_size)
269 269 
     }
270 270 
 }
271 271
272 
-void rgb15tobgr15(const uint8_t *src, uint8_t *dst, long src_size)
272 
+void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size)
273 273 
 {
274 
-    long i;
275 
-    long num_pixels = src_size >> 1;
274 
+    int i;
275 
+    int num_pixels = src_size >> 1;
276 276
277 277 
     for (i=0; i<num_pixels; i++) {
278 278 
         unsigned br;
... ... 
@@ -282,10 +282,10 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, long src_size)
282 282 
     }
283 283 
 }
284 284
285 
-void bgr8torgb8(const uint8_t *src, uint8_t *dst, long src_size)
285 
+void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size)
286 286 
 {
287 
-    long i;
288 
-    long num_pixels = src_size;
287 
+    int i;
288 
+    int num_pixels = src_size;
289 289 
     for (i=0; i<num_pixels; i++) {
290 290 
         unsigned b,g,r;
291 291 
         register uint8_t rgb;
... ... 
@@ -298,9 +298,9 @@ void bgr8torgb8(const uint8_t *src, uint8_t *dst, long src_size)
298 298 
 }
299 299
300 300 
 #define DEFINE_SHUFFLE_BYTES(a, b, c, d)                                \
301 
-void shuffle_bytes_##a##b##c##d(const uint8_t *src, uint8_t *dst, long src_size) \
301 
+void shuffle_bytes_##a##b##c##d(const uint8_t *src, uint8_t *dst, int src_size) \
302 302 
 {                                                                       \
303 
-    long i;                                                             \
303 
+    int i;                                                             \
304 304 
                                                                         \
305 305 
     for (i = 0; i < src_size; i+=4) {                                   \
306 306 
         dst[i + 0] = src[i + a];                                        \
libswscale/rgb2rgb.h
History View file @ b8e8933
... ... 
@@ -32,83 +32,83 @@
32 32 
 #include "libavutil/avutil.h"
33 33
34 34 
 /* A full collection of RGB to RGB(BGR) converters */
35 
-extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);
36 
-extern void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
37 
-extern void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
38 
-extern void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
39 
-extern void (*rgb32to16)   (const uint8_t *src, uint8_t *dst, long src_size);
40 
-extern void (*rgb32to15)   (const uint8_t *src, uint8_t *dst, long src_size);
41 
-extern void (*rgb15to16)   (const uint8_t *src, uint8_t *dst, long src_size);
42 
-extern void (*rgb15tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
43 
-extern void (*rgb15to32)   (const uint8_t *src, uint8_t *dst, long src_size);
44 
-extern void (*rgb16to15)   (const uint8_t *src, uint8_t *dst, long src_size);
45 
-extern void (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
46 
-extern void (*rgb16to32)   (const uint8_t *src, uint8_t *dst, long src_size);
47 
-extern void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
48 
-extern void (*rgb24to16)   (const uint8_t *src, uint8_t *dst, long src_size);
49 
-extern void (*rgb24to15)   (const uint8_t *src, uint8_t *dst, long src_size);
50 
-extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, long src_size);
51 
-extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
52 
-extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
53 
-
54 
-void rgb24to32   (const uint8_t *src, uint8_t *dst, long src_size);
55 
-void rgb32to24   (const uint8_t *src, uint8_t *dst, long src_size);
56 
-void rgb16tobgr32(const uint8_t *src, uint8_t *dst, long src_size);
57 
-void rgb16to24   (const uint8_t *src, uint8_t *dst, long src_size);
58 
-void rgb16tobgr16(const uint8_t *src, uint8_t *dst, long src_size);
59 
-void rgb16tobgr15(const uint8_t *src, uint8_t *dst, long src_size);
60 
-void rgb15tobgr32(const uint8_t *src, uint8_t *dst, long src_size);
61 
-void rgb15to24   (const uint8_t *src, uint8_t *dst, long src_size);
62 
-void rgb15tobgr16(const uint8_t *src, uint8_t *dst, long src_size);
63 
-void rgb15tobgr15(const uint8_t *src, uint8_t *dst, long src_size);
64 
-void bgr8torgb8  (const uint8_t *src, uint8_t *dst, long src_size);
65 
-
66 
-void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, long src_size);
67 
-void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, long src_size);
68 
-void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, long src_size);
69 
-void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, long src_size);
35 
+extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size);
36 
+extern void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
37 
+extern void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
38 
+extern void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
39 
+extern void (*rgb32to16)   (const uint8_t *src, uint8_t *dst, int src_size);
40 
+extern void (*rgb32to15)   (const uint8_t *src, uint8_t *dst, int src_size);
41 
+extern void (*rgb15to16)   (const uint8_t *src, uint8_t *dst, int src_size);
42 
+extern void (*rgb15tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
43 
+extern void (*rgb15to32)   (const uint8_t *src, uint8_t *dst, int src_size);
44 
+extern void (*rgb16to15)   (const uint8_t *src, uint8_t *dst, int src_size);
45 
+extern void (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
46 
+extern void (*rgb16to32)   (const uint8_t *src, uint8_t *dst, int src_size);
47 
+extern void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
48 
+extern void (*rgb24to16)   (const uint8_t *src, uint8_t *dst, int src_size);
49 
+extern void (*rgb24to15)   (const uint8_t *src, uint8_t *dst, int src_size);
50 
+extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
51 
+extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
52 
+extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
53 
+
54 
+void rgb24to32   (const uint8_t *src, uint8_t *dst, int src_size);
55 
+void rgb32to24   (const uint8_t *src, uint8_t *dst, int src_size);
56 
+void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size);
57 
+void rgb16to24   (const uint8_t *src, uint8_t *dst, int src_size);
58 
+void rgb16tobgr16(const uint8_t *src, uint8_t *dst, int src_size);
59 
+void rgb16tobgr15(const uint8_t *src, uint8_t *dst, int src_size);
60 
+void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size);
61 
+void rgb15to24   (const uint8_t *src, uint8_t *dst, int src_size);
62 
+void rgb15tobgr16(const uint8_t *src, uint8_t *dst, int src_size);
63 
+void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size);
64 
+void bgr8torgb8  (const uint8_t *src, uint8_t *dst, int src_size);
65 
+
66 
+void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size);
67 
+void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size);
68 
+void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size);
69 
+void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size);
70 70
71 71 
 void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
72 
-                   uint8_t *vdst, long width, long height, long lumStride,
73 
-                   long chromStride, long srcStride);
72 
+                   uint8_t *vdst, int width, int height, int lumStride,
73 
+                   int chromStride, int srcStride);
74 74
75 75 
 /**
76 76 
  * Height should be a multiple of 2 and width should be a multiple of 16.
77 77 
  * (If this is a problem for anyone then tell me, and I will fix it.)
78 78 
  */
79 79 
 extern void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
80 
-                          long width, long height,
81 
-                          long lumStride, long chromStride, long dstStride);
80 
+                          int width, int height,
81 
+                          int lumStride, int chromStride, int dstStride);
82 82
83 83 
 /**
84 84 
  * Width should be a multiple of 16.
85 85 
  */
86 86 
 extern void (*yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
87 
-                             long width, long height,
88 
-                             long lumStride, long chromStride, long dstStride);
87 
+                             int width, int height,
88 
+                             int lumStride, int chromStride, int dstStride);
89 89
90 90 
 /**
91 91 
  * Height should be a multiple of 2 and width should be a multiple of 16.
92 92 
  * (If this is a problem for anyone then tell me, and I will fix it.)
93 93 
  */
94 94 
 extern void (*yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
95 
-                          long width, long height,
96 
-                          long lumStride, long chromStride, long srcStride);
95 
+                          int width, int height,
96 
+                          int lumStride, int chromStride, int srcStride);
97 97
98 98 
 /**
99 99 
  * Height should be a multiple of 2 and width should be a multiple of 16.
100 100 
  * (If this is a problem for anyone then tell me, and I will fix it.)
101 101 
  */
102 102 
 extern void (*yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
103 
-                          long width, long height,
104 
-                          long lumStride, long chromStride, long dstStride);
103 
+                          int width, int height,
104 
+                          int lumStride, int chromStride, int dstStride);
105 105
106 106 
 /**
107 107 
  * Width should be a multiple of 16.
108 108 
  */
109 109 
 extern void (*yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
110 
-                             long width, long height,
111 
-                             long lumStride, long chromStride, long dstStride);
110 
+                             int width, int height,
111 
+                             int lumStride, int chromStride, int dstStride);
112 112
113 113 
 /**
114 114 
  * Height should be a multiple of 2 and width should be a multiple of 2.
... ... 
@@ -117,40 +117,40 @@ extern void (*yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uin
117 117 
  * FIXME: Write high quality version.
118 118 
  */
119 119 
 extern void (*rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
120 
-                           long width, long height,
121 
-                           long lumStride, long chromStride, long srcStride);
122 
-extern void (*planar2x)(const uint8_t *src, uint8_t *dst, long width, long height,
123 
-                        long srcStride, long dstStride);
120 
+                           int width, int height,
121 
+                           int lumStride, int chromStride, int srcStride);
122 
+extern void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height,
123 
+                        int srcStride, int dstStride);
124 124
125 125 
 extern void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst,
126 
-                               long width, long height, long src1Stride,
127 
-                               long src2Stride, long dstStride);
126 
+                               int width, int height, int src1Stride,
127 
+                               int src2Stride, int dstStride);
128 128
129 129 
 extern void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
130 130 
                            uint8_t *dst1, uint8_t *dst2,
131 
-                           long width, long height,
132 
-                           long srcStride1, long srcStride2,
133 
-                           long dstStride1, long dstStride2);
131 
+                           int width, int height,
132 
+                           int srcStride1, int srcStride2,
133 
+                           int dstStride1, int dstStride2);
134 134
135 135 
 extern void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
136 136 
                             uint8_t *dst,
137 
-                            long width, long height,
138 
-                            long srcStride1, long srcStride2,
139 
-                            long srcStride3, long dstStride);
137 
+                            int width, int height,
138 
+                            int srcStride1, int srcStride2,
139 
+                            int srcStride3, int dstStride);
140 140
141 141
142 142 
 extern void (*uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
143 
-                            long width, long height,
144 
-                            long lumStride, long chromStride, long srcStride);
143 
+                            int width, int height,
144 
+                            int lumStride, int chromStride, int srcStride);
145 145 
 extern void (*uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
146 
-                            long width, long height,
147 
-                            long lumStride, long chromStride, long srcStride);
146 
+                            int width, int height,
147 
+                            int lumStride, int chromStride, int srcStride);
148 148 
 extern void (*yuyvtoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
149 
-                            long width, long height,
150 
-                            long lumStride, long chromStride, long srcStride);
149 
+                            int width, int height,
150 
+                            int lumStride, int chromStride, int srcStride);
151 151 
 extern void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
152 
-                            long width, long height,
153 
-                            long lumStride, long chromStride, long srcStride);
152 
+                            int width, int height,
153 
+                            int lumStride, int chromStride, int srcStride);
154 154
155 155 
 void sws_rgb2rgb_init(void);
156 156
libswscale/rgb2rgb_template.c
History View file @ b8e8933
... ... 
@@ -26,7 +26,7 @@
26 26
27 27 
 #include <stddef.h>
28 28
29 
-static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, long src_size)
29 
+static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, int src_size)
30 30 
 {
31 31 
     uint8_t *dest = dst;
32 32 
     const uint8_t *s = src;
... ... 
@@ -50,7 +50,7 @@ static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, long src_siz
50 50 
     }
51 51 
 }
52 52
53 
-static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst, long src_size)
53 
+static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size)
54 54 
 {
55 55 
     uint8_t *dest = dst;
56 56 
     const uint8_t *s = src;
... ... 
@@ -81,7 +81,7 @@ static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst, long src_siz
81 81 
  MMX2, 3DNOW optimization by Nick Kurshev
82 82 
  32-bit C version, and and&add trick by Michael Niedermayer
83 83 
 */
84 
-static inline void rgb15to16_c(const uint8_t *src, uint8_t *dst, long src_size)
84 
+static inline void rgb15to16_c(const uint8_t *src, uint8_t *dst, int src_size)
85 85 
 {
86 86 
     register const uint8_t* s=src;
87 87 
     register uint8_t* d=dst;
... ... 
@@ -101,7 +101,7 @@ static inline void rgb15to16_c(const uint8_t *src, uint8_t *dst, long src_size)
101 101 
     }
102 102 
 }
103 103
104 
-static inline void rgb16to15_c(const uint8_t *src, uint8_t *dst, long src_size)
104 
+static inline void rgb16to15_c(const uint8_t *src, uint8_t *dst, int src_size)
105 105 
 {
106 106 
     register const uint8_t* s=src;
107 107 
     register uint8_t* d=dst;
... ... 
@@ -122,7 +122,7 @@ static inline void rgb16to15_c(const uint8_t *src, uint8_t *dst, long src_size)
122 122 
     }
123 123 
 }
124 124
125 
-static inline void rgb32to16_c(const uint8_t *src, uint8_t *dst, long src_size)
125 
+static inline void rgb32to16_c(const uint8_t *src, uint8_t *dst, int src_size)
126 126 
 {
127 127 
     const uint8_t *s = src;
128 128 
     const uint8_t *end;
... ... 
@@ -135,7 +135,7 @@ static inline void rgb32to16_c(const uint8_t *src, uint8_t *dst, long src_size)
135 135 
     }
136 136 
 }
137 137
138 
-static inline void rgb32tobgr16_c(const uint8_t *src, uint8_t *dst, long src_size)
138 
+static inline void rgb32tobgr16_c(const uint8_t *src, uint8_t *dst, int src_size)
139 139 
 {
140 140 
     const uint8_t *s = src;
141 141 
     const uint8_t *end;
... ... 
@@ -147,7 +147,7 @@ static inline void rgb32tobgr16_c(const uint8_t *src, uint8_t *dst, long src_siz
147 147 
     }
148 148 
 }
149 149
150 
-static inline void rgb32to15_c(const uint8_t *src, uint8_t *dst, long src_size)
150 
+static inline void rgb32to15_c(const uint8_t *src, uint8_t *dst, int src_size)
151 151 
 {
152 152 
     const uint8_t *s = src;
153 153 
     const uint8_t *end;
... ... 
@@ -159,7 +159,7 @@ static inline void rgb32to15_c(const uint8_t *src, uint8_t *dst, long src_size)
159 159 
     }
160 160 
 }
161 161
162 
-static inline void rgb32tobgr15_c(const uint8_t *src, uint8_t *dst, long src_size)
162 
+static inline void rgb32tobgr15_c(const uint8_t *src, uint8_t *dst, int src_size)
163 163 
 {
164 164 
     const uint8_t *s = src;
165 165 
     const uint8_t *end;
... ... 
@@ -171,7 +171,7 @@ static inline void rgb32tobgr15_c(const uint8_t *src, uint8_t *dst, long src_siz
171 171 
     }
172 172 
 }
173 173
174 
-static inline void rgb24tobgr16_c(const uint8_t *src, uint8_t *dst, long src_size)
174 
+static inline void rgb24tobgr16_c(const uint8_t *src, uint8_t *dst, int src_size)
175 175 
 {
176 176 
     const uint8_t *s = src;
177 177 
     const uint8_t *end;
... ... 
@@ -185,7 +185,7 @@ static inline void rgb24tobgr16_c(const uint8_t *src, uint8_t *dst, long src_siz
185 185 
     }
186 186 
 }
187 187
188 
-static inline void rgb24to16_c(const uint8_t *src, uint8_t *dst, long src_size)
188 
+static inline void rgb24to16_c(const uint8_t *src, uint8_t *dst, int src_size)
189 189 
 {
190 190 
     const uint8_t *s = src;
191 191 
     const uint8_t *end;
... ... 
@@ -199,7 +199,7 @@ static inline void rgb24to16_c(const uint8_t *src, uint8_t *dst, long src_size)
199 199 
     }
200 200 
 }
201 201
202 
-static inline void rgb24tobgr15_c(const uint8_t *src, uint8_t *dst, long src_size)
202 
+static inline void rgb24tobgr15_c(const uint8_t *src, uint8_t *dst, int src_size)
203 203 
 {
204 204 
     const uint8_t *s = src;
205 205 
     const uint8_t *end;
... ... 
@@ -213,7 +213,7 @@ static inline void rgb24tobgr15_c(const uint8_t *src, uint8_t *dst, long src_siz
213 213 
     }
214 214 
 }
215 215
216 
-static inline void rgb24to15_c(const uint8_t *src, uint8_t *dst, long src_size)
216 
+static inline void rgb24to15_c(const uint8_t *src, uint8_t *dst, int src_size)
217 217 
 {
218 218 
     const uint8_t *s = src;
219 219 
     const uint8_t *end;
... ... 
@@ -248,7 +248,7 @@ static inline void rgb24to15_c(const uint8_t *src, uint8_t *dst, long src_size)
248 248 
        |
249 249 
    original bits
250 250 
 */
251 
-static inline void rgb15tobgr24_c(const uint8_t *src, uint8_t *dst, long src_size)
251 
+static inline void rgb15tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size)
252 252 
 {
253 253 
     const uint16_t *end;
254 254 
     uint8_t *d = dst;
... ... 
@@ -263,7 +263,7 @@ static inline void rgb15tobgr24_c(const uint8_t *src, uint8_t *dst, long src_siz
263 263 
     }
264 264 
 }
265 265
266 
-static inline void rgb16tobgr24_c(const uint8_t *src, uint8_t *dst, long src_size)
266 
+static inline void rgb16tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size)
267 267 
 {
268 268 
     const uint16_t *end;
269 269 
     uint8_t *d = (uint8_t *)dst;
... ... 
@@ -278,7 +278,7 @@ static inline void rgb16tobgr24_c(const uint8_t *src, uint8_t *dst, long src_siz
278 278 
     }
279 279 
 }
280 280
281 
-static inline void rgb15to32_c(const uint8_t *src, uint8_t *dst, long src_size)
281 
+static inline void rgb15to32_c(const uint8_t *src, uint8_t *dst, int src_size)
282 282 
 {
283 283 
     const uint16_t *end;
284 284 
     uint8_t *d = dst;
... ... 
@@ -301,7 +301,7 @@ static inline void rgb15to32_c(const uint8_t *src, uint8_t *dst, long src_size)
301 301 
     }
302 302 
 }
303 303
304 
-static inline void rgb16to32_c(const uint8_t *src, uint8_t *dst, long src_size)
304 
+static inline void rgb16to32_c(const uint8_t *src, uint8_t *dst, int src_size)
305 305 
 {
306 306 
     const uint16_t *end;
307 307 
     uint8_t *d = dst;
... ... 
@@ -324,7 +324,7 @@ static inline void rgb16to32_c(const uint8_t *src, uint8_t *dst, long src_size)
324 324 
     }
325 325 
 }
326 326
327 
-static inline void shuffle_bytes_2103_c(const uint8_t *src, uint8_t *dst, long src_size)
327 
+static inline void shuffle_bytes_2103_c(const uint8_t *src, uint8_t *dst, int src_size)
328 328 
 {
329 329 
     int idx = 15 - src_size;
330 330 
     const uint8_t *s = src-idx;
... ... 
@@ -336,7 +336,7 @@ static inline void shuffle_bytes_2103_c(const uint8_t *src, uint8_t *dst, long s
336 336 
     }
337 337 
 }
338 338
339 
-static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, long src_size)
339 
+static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size)
340 340 
 {
341 341 
     unsigned i;
342 342 
     for (i=0; i<src_size; i+=3) {
... ... 
@@ -350,11 +350,11 @@ static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, long src_siz
350 350
351 351 
 static inline void yuvPlanartoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
352 352 
                                      const uint8_t *vsrc, uint8_t *dst,
353 
-                                     long width, long height,
354 
-                                     long lumStride, long chromStride,
355 
-                                     long dstStride, long vertLumPerChroma)
353 
+                                     int width, int height,
354 
+                                     int lumStride, int chromStride,
355 
+                                     int dstStride, int vertLumPerChroma)
356 356 
 {
357 
-    long y;
357 
+    int y;
358 358 
     const int chromWidth = width >> 1;
359 359 
     for (y=0; y<height; y++) {
360 360 
 #if HAVE_FAST_64BIT
... ... 
@@ -404,9 +404,9 @@ static inline void yuvPlanartoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
404 404 
  */
405 405 
 static inline void yv12toyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
406 406 
                                 const uint8_t *vsrc, uint8_t *dst,
407 
-                                long width, long height,
408 
-                                long lumStride, long chromStride,
409 
-                                long dstStride)
407 
+                                int width, int height,
408 
+                                int lumStride, int chromStride,
409 
+                                int dstStride)
410 410 
 {
411 411 
     //FIXME interpolate chroma
412 412 
     yuvPlanartoyuy2_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
... ... 
@@ -415,11 +415,11 @@ static inline void yv12toyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
415 415
416 416 
 static inline void yuvPlanartouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
417 417 
                                      const uint8_t *vsrc, uint8_t *dst,
418 
-                                     long width, long height,
419 
-                                     long lumStride, long chromStride,
420 
-                                     long dstStride, long vertLumPerChroma)
418 
+                                     int width, int height,
419 
+                                     int lumStride, int chromStride,
420 
+                                     int dstStride, int vertLumPerChroma)
421 421 
 {
422 
-    long y;
422 
+    int y;
423 423 
     const int chromWidth = width >> 1;
424 424 
     for (y=0; y<height; y++) {
425 425 
 #if HAVE_FAST_64BIT
... ... 
@@ -469,9 +469,9 @@ static inline void yuvPlanartouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
469 469 
  */
470 470 
 static inline void yv12touyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
471 471 
                                 const uint8_t *vsrc, uint8_t *dst,
472 
-                                long width, long height,
473 
-                                long lumStride, long chromStride,
474 
-                                long dstStride)
472 
+                                int width, int height,
473 
+                                int lumStride, int chromStride,
474 
+                                int dstStride)
475 475 
 {
476 476 
     //FIXME interpolate chroma
477 477 
     yuvPlanartouyvy_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
... ... 
@@ -483,9 +483,9 @@ static inline void yv12touyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
483 483 
  */
484 484 
 static inline void yuv422ptouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
485 485 
                                    const uint8_t *vsrc, uint8_t *dst,
486 
-                                   long width, long height,
487 
-                                   long lumStride, long chromStride,
488 
-                                   long dstStride)
486 
+                                   int width, int height,
487 
+                                   int lumStride, int chromStride,
488 
+                                   int dstStride)
489 489 
 {
490 490 
     yuvPlanartouyvy_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
491 491 
                       chromStride, dstStride, 1);
... ... 
@@ -496,9 +496,9 @@ static inline void yuv422ptouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
496 496 
  */
497 497 
 static inline void yuv422ptoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
498 498 
                                    const uint8_t *vsrc, uint8_t *dst,
499 
-                                   long width, long height,
500 
-                                   long lumStride, long chromStride,
501 
-                                   long dstStride)
499 
+                                   int width, int height,
500 
+                                   int lumStride, int chromStride,
501 
+                                   int dstStride)
502 502 
 {
503 503 
     yuvPlanartoyuy2_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
504 504 
                       chromStride, dstStride, 1);
... ... 
@@ -510,14 +510,14 @@ static inline void yuv422ptoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
510 510 
  */
511 511 
 static inline void yuy2toyv12_c(const uint8_t *src, uint8_t *ydst,
512 512 
                                 uint8_t *udst, uint8_t *vdst,
513 
-                                long width, long height,
514 
-                                long lumStride, long chromStride,
515 
-                                long srcStride)
513 
+                                int width, int height,
514 
+                                int lumStride, int chromStride,
515 
+                                int srcStride)
516 516 
 {
517 
-    long y;
517 
+    int y;
518 518 
     const int chromWidth = width >> 1;
519 519 
     for (y=0; y<height; y+=2) {
520 
-        long i;
520 
+        int i;
521 521 
         for (i=0; i<chromWidth; i++) {
522 522 
             ydst[2*i+0]     = src[4*i+0];
523 523 
             udst[i]     = src[4*i+1];
... ... 
@@ -538,10 +538,10 @@ static inline void yuy2toyv12_c(const uint8_t *src, uint8_t *ydst,
538 538 
     }
539 539 
 }
540 540
541 
-static inline void planar2x_c(const uint8_t *src, uint8_t *dst, long srcWidth,
542 
-                              long srcHeight, long srcStride, long dstStride)
541 
+static inline void planar2x_c(const uint8_t *src, uint8_t *dst, int srcWidth,
542 
+                              int srcHeight, int srcStride, int dstStride)
543 543 
 {
544 
-    long x,y;
544 
+    int x,y;
545 545
546 546 
     dst[0]= src[0];
547 547
... ... 
@@ -598,14 +598,14 @@ static inline void planar2x_c(const uint8_t *src, uint8_t *dst, long srcWidth,
598 598 
  */
599 599 
 static inline void uyvytoyv12_c(const uint8_t *src, uint8_t *ydst,
600 600 
                                 uint8_t *udst, uint8_t *vdst,
601 
-                                long width, long height,
602 
-                                long lumStride, long chromStride,
603 
-                                long srcStride)
601 
+                                int width, int height,
602 
+                                int lumStride, int chromStride,
603 
+                                int srcStride)
604 604 
 {
605 
-    long y;
605 
+    int y;
606 606 
     const int chromWidth = width >> 1;
607 607 
     for (y=0; y<height; y+=2) {
608 
-        long i;
608 
+        int i;
609 609 
         for (i=0; i<chromWidth; i++) {
610 610 
             udst[i]     = src[4*i+0];
611 611 
             ydst[2*i+0] = src[4*i+1];
... ... 
@@ -634,14 +634,14 @@ static inline void uyvytoyv12_c(const uint8_t *src, uint8_t *ydst,
634 634 
  * FIXME: Write HQ version.
635 635 
  */
636 636 
 void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
637 
-                   uint8_t *vdst, long width, long height, long lumStride,
638 
-                   long chromStride, long srcStride)
637 
+                   uint8_t *vdst, int width, int height, int lumStride,
638 
+                   int chromStride, int srcStride)
639 639 
 {
640 
-    long y;
640 
+    int y;
641 641 
     const int chromWidth = width >> 1;
642 642 
     y=0;
643 643 
     for (; y<height; y+=2) {
644 
-        long i;
644 
+        int i;
645 645 
         for (i=0; i<chromWidth; i++) {
646 646 
             unsigned int b = src[6*i+0];
647 647 
             unsigned int g = src[6*i+1];
... ... 
@@ -689,14 +689,14 @@ void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
689 689 
 }
690 690
691 691 
 static void interleaveBytes_c(const uint8_t *src1, const uint8_t *src2,
692 
-                              uint8_t *dest, long width,
693 
-                              long height, long src1Stride,
694 
-                              long src2Stride, long dstStride)
692 
+                              uint8_t *dest, int width,
693 
+                              int height, int src1Stride,
694 
+                              int src2Stride, int dstStride)
695 695 
 {
696 
-    long h;
696 
+    int h;
697 697
698 698 
     for (h=0; h < height; h++) {
699 
-        long w;
699 
+        int w;
700 700 
         for (w=0; w < width; w++) {
701 701 
             dest[2*w+0] = src1[w];
702 702 
             dest[2*w+1] = src2[w];
... ... 
@@ -709,12 +709,12 @@ static void interleaveBytes_c(const uint8_t *src1, const uint8_t *src2,
709 709
710 710 
 static inline void vu9_to_vu12_c(const uint8_t *src1, const uint8_t *src2,
711 711 
                                  uint8_t *dst1, uint8_t *dst2,
712 
-                                 long width, long height,
713 
-                                 long srcStride1, long srcStride2,
714 
-                                 long dstStride1, long dstStride2)
712 
+                                 int width, int height,
713 
+                                 int srcStride1, int srcStride2,
714 
+                                 int dstStride1, int dstStride2)
715 715 
 {
716 716 
     int y;
717 
-    long x,w,h;
717 
+    int x,w,h;
718 718 
     w=width/2; h=height/2;
719 719 
     for (y=0;y<h;y++) {
720 720 
         const uint8_t* s1=src1+srcStride1*(y>>1);
... ... 
@@ -732,12 +732,12 @@ static inline void vu9_to_vu12_c(const uint8_t *src1, const uint8_t *src2,
732 732
733 733 
 static inline void yvu9_to_yuy2_c(const uint8_t *src1, const uint8_t *src2,
734 734 
                                   const uint8_t *src3, uint8_t *dst,
735 
-                                  long width, long height,
736 
-                                  long srcStride1, long srcStride2,
737 
-                                  long srcStride3, long dstStride)
735 
+                                  int width, int height,
736 
+                                  int srcStride1, int srcStride2,
737 
+                                  int srcStride3, int dstStride)
738 738 
 {
739 739 
     int x;
740 
-    long y,w,h;
740 
+    int y,w,h;
741 741 
     w=width/2; h=height;
742 742 
     for (y=0;y<h;y++) {
743 743 
         const uint8_t* yp=src1+srcStride1*y;
... ... 
@@ -746,7 +746,7 @@ static inline void yvu9_to_yuy2_c(const uint8_t *src1, const uint8_t *src2,
746 746 
         uint8_t* d=dst+dstStride*y;
747 747 
         x=0;
748 748 
         for (; x<w; x++) {
749 
-            const long x2 = x<<2;
749 
+            const int x2 = x<<2;
750 750 
             d[8*x+0] = yp[x2];
751 751 
             d[8*x+1] = up[x];
752 752 
             d[8*x+2] = yp[x2+1];
... ... 
@@ -833,11 +833,11 @@ static void extract_odd2avg_c(const uint8_t *src0, const uint8_t *src1,
833 833 
 }
834 834
835 835 
 static void yuyvtoyuv420_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
836 
-                           const uint8_t *src, long width, long height,
837 
-                           long lumStride, long chromStride, long srcStride)
836 
+                           const uint8_t *src, int width, int height,
837 
+                           int lumStride, int chromStride, int srcStride)
838 838 
 {
839 
-    long y;
840 
-    const long chromWidth= -((-width)>>1);
839 
+    int y;
840 
+    const int chromWidth= -((-width)>>1);
841 841
842 842 
     for (y=0; y<height; y++) {
843 843 
         extract_even_c(src, ydst, width);
... ... 
@@ -853,11 +853,11 @@ static void yuyvtoyuv420_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
853 853 
 }
854 854
855 855 
 static void yuyvtoyuv422_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
856 
-                           const uint8_t *src, long width, long height,
857 
-                           long lumStride, long chromStride, long srcStride)
856 
+                           const uint8_t *src, int width, int height,
857 
+                           int lumStride, int chromStride, int srcStride)
858 858 
 {
859 
-    long y;
860 
-    const long chromWidth= -((-width)>>1);
859 
+    int y;
860 
+    const int chromWidth= -((-width)>>1);
861 861
862 862 
     for (y=0; y<height; y++) {
863 863 
         extract_even_c(src, ydst, width);
... ... 
@@ -871,11 +871,11 @@ static void yuyvtoyuv422_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
871 871 
 }
872 872
873 873 
 static void uyvytoyuv420_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
874 
-                           const uint8_t *src, long width, long height,
875 
-                           long lumStride, long chromStride, long srcStride)
874 
+                           const uint8_t *src, int width, int height,
875 
+                           int lumStride, int chromStride, int srcStride)
876 876 
 {
877 
-    long y;
878 
-    const long chromWidth= -((-width)>>1);
877 
+    int y;
878 
+    const int chromWidth= -((-width)>>1);
879 879
880 880 
     for (y=0; y<height; y++) {
881 881 
         extract_even_c(src + 1, ydst, width);
... ... 
@@ -891,11 +891,11 @@ static void uyvytoyuv420_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
891 891 
 }
892 892
893 893 
 static void uyvytoyuv422_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
894 
-                           const uint8_t *src, long width, long height,
895 
-                           long lumStride, long chromStride, long srcStride)
894 
+                           const uint8_t *src, int width, int height,
895 
+                           int lumStride, int chromStride, int srcStride)
896 896 
 {
897 
-    long y;
898 
-    const long chromWidth= -((-width)>>1);
897 
+    int y;
898 
+    const int chromWidth= -((-width)>>1);
899 899
900 900 
     for (y=0; y<height; y++) {
901 901 
         extract_even_c(src + 1, ydst, width);
libswscale/swscale.c
History View file @ b8e8933
... ... 
@@ -980,7 +980,7 @@ static void fillPlane(uint8_t* plane, int stride, int width, int height, int y,
980 980 
     }
981 981 
 }
982 982
983 
-static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, long width,
983 
+static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, int width,
984 984 
                             uint32_t *unused)
985 985 
 {
986 986 
     int i;
... ... 
@@ -995,7 +995,7 @@ static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, long width,
995 995
996 996 
 static inline void rgb48ToUV(uint8_t *dstU, uint8_t *dstV,
997 997 
                              const uint8_t *src1, const uint8_t *src2,
998 
-                             long width, uint32_t *unused)
998 
+                             int width, uint32_t *unused)
999 999 
 {
1000 1000 
     int i;
1001 1001 
     assert(src1==src2);
... ... 
@@ -1011,7 +1011,7 @@ static inline void rgb48ToUV(uint8_t *dstU, uint8_t *dstV,
1011 1011
1012 1012 
 static inline void rgb48ToUV_half(uint8_t *dstU, uint8_t *dstV,
1013 1013 
                                   const uint8_t *src1, const uint8_t *src2,
1014 
-                                  long width, uint32_t *unused)
1014 
+                                  int width, uint32_t *unused)
1015 1015 
 {
1016 1016 
     int i;
1017 1017 
     assert(src1==src2);
... ... 
@@ -1025,7 +1025,7 @@ static inline void rgb48ToUV_half(uint8_t *dstU, uint8_t *dstV,
1025 1025 
     }
1026 1026 
 }
1027 1027
1028 
-static inline void bgr48ToY(uint8_t *dst, const uint8_t *src, long width,
1028 
+static inline void bgr48ToY(uint8_t *dst, const uint8_t *src, int width,
1029 1029 
                             uint32_t *unused)
1030 1030 
 {
1031 1031 
     int i;
... ... 
@@ -1040,7 +1040,7 @@ static inline void bgr48ToY(uint8_t *dst, const uint8_t *src, long width,
1040 1040
1041 1041 
 static inline void bgr48ToUV(uint8_t *dstU, uint8_t *dstV,
1042 1042 
                              const uint8_t *src1, const uint8_t *src2,
1043 
-                             long width, uint32_t *unused)
1043 
+                             int width, uint32_t *unused)
1044 1044 
 {
1045 1045 
     int i;
1046 1046 
     for (i = 0; i < width; i++) {
... ... 
@@ -1055,7 +1055,7 @@ static inline void bgr48ToUV(uint8_t *dstU, uint8_t *dstV,
1055 1055
1056 1056 
 static inline void bgr48ToUV_half(uint8_t *dstU, uint8_t *dstV,
1057 1057 
                                   const uint8_t *src1, const uint8_t *src2,
1058 
-                                  long width, uint32_t *unused)
1058 
+                                  int width, uint32_t *unused)
1059 1059 
 {
1060 1060 
     int i;
1061 1061 
     for (i = 0; i < width; i++) {
... ... 
@@ -1069,7 +1069,7 @@ static inline void bgr48ToUV_half(uint8_t *dstU, uint8_t *dstV,
1069 1069 
 }
1070 1070
1071 1071 
 #define BGR2Y(type, name, shr, shg, shb, maskr, maskg, maskb, RY, GY, BY, S)\
1072 
-static inline void name(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)\
1072 
+static inline void name(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)\
1073 1073 
 {\
1074 1074 
     int i;\
1075 1075 
     for (i=0; i<width; i++) {\
... ... 
@@ -1090,7 +1090,7 @@ BGR2Y(uint16_t, bgr15ToY, 0, 0, 0, 0x001F, 0x03E0, 0x7C00, RY<<10, GY<<5, BY
1090 1090 
 BGR2Y(uint16_t, rgb16ToY, 0, 0, 0, 0xF800, 0x07E0, 0x001F, RY    , GY<<5, BY<<11, RGB2YUV_SHIFT+8)
1091 1091 
 BGR2Y(uint16_t, rgb15ToY, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, RY    , GY<<5, BY<<10, RGB2YUV_SHIFT+7)
1092 1092
1093 
-static inline void abgrToA(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
1093 
+static inline void abgrToA(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)
1094 1094 
 {
1095 1095 
     int i;
1096 1096 
     for (i=0; i<width; i++) {
... ... 
@@ -1099,7 +1099,7 @@ static inline void abgrToA(uint8_t *dst, const uint8_t *src, long width, uint32_
1099 1099 
 }
1100 1100
1101 1101 
 #define BGR2UV(type, name, shr, shg, shb, shp, maskr, maskg, maskb, RU, GU, BU, RV, GV, BV, S) \
1102 
-static inline void name(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *dummy, long width, uint32_t *unused)\
1102 
+static inline void name(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *dummy, int width, uint32_t *unused)\
1103 1103 
 {\
1104 1104 
     int i;\
1105 1105 
     for (i=0; i<width; i++) {\
... ... 
@@ -1111,7 +1111,7 @@ static inline void name(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const
1111 1111 
         dstV[i]= ((RV)*r + (GV)*g + (BV)*b + (257<<((S)-1)))>>(S);\
1112 1112 
     }\
1113 1113 
 }\
1114 
-static inline void name ## _half(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *dummy, long width, uint32_t *unused)\
1114 
+static inline void name ## _half(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *dummy, int width, uint32_t *unused)\
1115 1115 
 {\
1116 1116 
     int i;\
1117 1117 
     for (i=0; i<width; i++) {\
... ... 
@@ -1138,7 +1138,7 @@ BGR2UV(uint16_t, bgr15ToUV, 0, 0, 0, 0,   0x001F, 0x03E0,   0x7C00, RU<<10, GU<<
1138 1138 
 BGR2UV(uint16_t, rgb16ToUV, 0, 0, 0, 0,   0xF800, 0x07E0,   0x001F, RU    , GU<<5, BU<<11, RV    , GV<<5, BV<<11, RGB2YUV_SHIFT+8)
1139 1139 
 BGR2UV(uint16_t, rgb15ToUV, 0, 0, 0, 0,   0x7C00, 0x03E0,   0x001F, RU    , GU<<5, BU<<10, RV    , GV<<5, BV<<10, RGB2YUV_SHIFT+7)
1140 1140
1141 
-static inline void palToY(uint8_t *dst, const uint8_t *src, long width, uint32_t *pal)
1141 
+static inline void palToY(uint8_t *dst, const uint8_t *src, int width, uint32_t *pal)
1142 1142 
 {
1143 1143 
     int i;
1144 1144 
     for (i=0; i<width; i++) {
... ... 
@@ -1150,7 +1150,7 @@ static inline void palToY(uint8_t *dst, const uint8_t *src, long width, uint32_t
1150 1150
1151 1151 
 static inline void palToUV(uint8_t *dstU, uint8_t *dstV,
1152 1152 
                            const uint8_t *src1, const uint8_t *src2,
1153 
-                           long width, uint32_t *pal)
1153 
+                           int width, uint32_t *pal)
1154 1154 
 {
1155 1155 
     int i;
1156 1156 
     assert(src1 == src2);
... ... 
@@ -1162,7 +1162,7 @@ static inline void palToUV(uint8_t *dstU, uint8_t *dstV,
1162 1162 
     }
1163 1163 
 }
1164 1164
1165 
-static inline void monowhite2Y(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
1165 
+static inline void monowhite2Y(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)
1166 1166 
 {
1167 1167 
     int i, j;
1168 1168 
     for (i=0; i<width/8; i++) {
... ... 
@@ -1172,7 +1172,7 @@ static inline void monowhite2Y(uint8_t *dst, const uint8_t *src, long width, uin
1172 1172 
     }
1173 1173 
 }
1174 1174
1175 
-static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
1175 
+static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)
1176 1176 
 {
1177 1177 
     int i, j;
1178 1178 
     for (i=0; i<width/8; i++) {
... ... 
@@ -1365,24 +1365,24 @@ static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
1365 1365 
     return srcSliceH;
1366 1366 
 }
1367 1367
1368 
-static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette)
1368 
+static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
1369 1369 
 {
1370 
-    long i;
1370 
+    int i;
1371 1371 
     for (i=0; i<num_pixels; i++)
1372 1372 
         ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] | (src[(i<<1)+1] << 24);
1373 1373 
 }
1374 1374
1375 
-static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette)
1375 
+static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
1376 1376 
 {
1377 
-    long i;
1377 
+    int i;
1378 1378
1379 1379 
     for (i=0; i<num_pixels; i++)
1380 1380 
         ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] | src[(i<<1)+1];
1381 1381 
 }
1382 1382
1383 
-static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette)
1383 
+static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
1384 1384 
 {
1385 
-    long i;
1385 
+    int i;
1386 1386
1387 1387 
     for (i=0; i<num_pixels; i++) {
1388 1388 
         //FIXME slow?
... ... 
@@ -1398,7 +1398,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
1398 1398 
 {
1399 1399 
     const enum PixelFormat srcFormat= c->srcFormat;
1400 1400 
     const enum PixelFormat dstFormat= c->dstFormat;
1401 
-    void (*conv)(const uint8_t *src, uint8_t *dst, long num_pixels,
1401 
+    void (*conv)(const uint8_t *src, uint8_t *dst, int num_pixels,
1402 1402 
                  const uint8_t *palette)=NULL;
1403 1403 
     int i;
1404 1404 
     uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
... ... 
@@ -1455,7 +1455,7 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
1455 1455 
     const int dstBpp= (c->dstFormatBpp + 7) >> 3;
1456 1456 
     const int srcId= c->srcFormatBpp >> 2; /* 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8 */
1457 1457 
     const int dstId= c->dstFormatBpp >> 2;
1458 
-    void (*conv)(const uint8_t *src, uint8_t *dst, long src_size)=NULL;
1458 
+    void (*conv)(const uint8_t *src, uint8_t *dst, int src_size)=NULL;
1459 1459
1460 1460 
 #define CONV_IS(src, dst) (srcFormat == PIX_FMT_##src && dstFormat == PIX_FMT_##dst)
1461 1461
... ... 
@@ -2057,18 +2057,18 @@ int sws_scale(SwsContext *c, const uint8_t* const src[], const int srcStride[],
2057 2057 
 }
2058 2058
2059 2059 
 /* Convert the palette to the same packed 32-bit format as the palette */
2060 
-void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette)
2060 
+void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
2061 2061 
 {
2062 
-    long i;
2062 
+    int i;
2063 2063
2064 2064 
     for (i=0; i<num_pixels; i++)
2065 2065 
         ((uint32_t *) dst)[i] = ((const uint32_t *) palette)[src[i]];
2066 2066 
 }
2067 2067
2068 2068 
 /* Palette format: ABCD -> dst format: ABC */
2069 
-void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette)
2069 
+void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
2070 2070 
 {
2071 
-    long i;
2071 
+    int i;
2072 2072
2073 2073 
     for (i=0; i<num_pixels; i++) {
2074 2074 
         //FIXME slow?
libswscale/swscale.h
History View file @ b8e8933
... ... 
@@ -335,7 +335,7 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context,
335 335 
  * @param num_pixels number of pixels to convert
336 336 
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
337 337 
  */
338 
-void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
338 
+void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
339 339
340 340 
 /**
341 341 
  * Converts an 8bit paletted frame into a frame with a color depth of 24 bits.
... ... 
@@ -347,7 +347,7 @@ void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, long num_pi
347 347 
  * @param num_pixels number of pixels to convert
348 348 
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
349 349 
  */
350 
-void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
350 
+void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette);
351 351
352 352
353 353 
 #endif /* SWSCALE_SWSCALE_H */
libswscale/swscale_internal.h
History View file @ b8e8933
... ... 
@@ -261,7 +261,7 @@ typedef struct SwsContext {
261 261 
                         const int16_t *chrVSrc, const int16_t *alpSrc,
262 262 
                         uint8_t *dest,
263 263 
                         uint8_t *uDest, uint8_t *vDest, uint8_t *aDest,
264 
-                        long dstW, long chrDstW);
264 
+                        int dstW, int chrDstW);
265 265 
     void (*yuv2yuvX   )(struct SwsContext *c,
266 266 
                         const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize,
267 267 
                         const int16_t *chrFilter, const int16_t **chrUSrc,
... ... 
@@ -269,7 +269,7 @@ typedef struct SwsContext {
269 269 
                         const int16_t **alpSrc,
270 270 
                         uint8_t *dest,
271 271 
                         uint8_t *uDest, uint8_t *vDest, uint8_t *aDest,
272 
-                        long dstW, long chrDstW);
272 
+                        int dstW, int chrDstW);
273 273 
     void (*yuv2packed1)(struct SwsContext *c,
274 274 
                         const uint16_t *buf0,
275 275 
                         const uint16_t *ubuf0, const uint16_t *ubuf1,
... ... 
@@ -289,26 +289,26 @@ typedef struct SwsContext {
289 289 
                         const int16_t *chrFilter, const int16_t **chrUSrc,
290 290 
                         const int16_t **chrVSrc, int chrFilterSize,
291 291 
                         const int16_t **alpSrc, uint8_t *dest,
292 
-                        long dstW, long dstY);
292 
+                        int dstW, int dstY);
293 293
294 294 
     void (*lumToYV12)(uint8_t *dst, const uint8_t *src,
295 
-                      long width, uint32_t *pal); ///< Unscaled conversion of luma plane to YV12 for horizontal scaler.
295 
+                      int width, uint32_t *pal); ///< Unscaled conversion of luma plane to YV12 for horizontal scaler.
296 296 
     void (*alpToYV12)(uint8_t *dst, const uint8_t *src,
297 
-                      long width, uint32_t *pal); ///< Unscaled conversion of alpha plane to YV12 for horizontal scaler.
297 
+                      int width, uint32_t *pal); ///< Unscaled conversion of alpha plane to YV12 for horizontal scaler.
298 298 
     void (*chrToYV12)(uint8_t *dstU, uint8_t *dstV,
299 299 
                       const uint8_t *src1, const uint8_t *src2,
300 
-                      long width, uint32_t *pal); ///< Unscaled conversion of chroma planes to YV12 for horizontal scaler.
300 
+                      int width, uint32_t *pal); ///< Unscaled conversion of chroma planes to YV12 for horizontal scaler.
301 301 
     void (*hyscale_fast)(struct SwsContext *c,
302 
-                         int16_t *dst, long dstWidth,
302 
+                         int16_t *dst, int dstWidth,
303 303 
                          const uint8_t *src, int srcW, int xInc);
304 304 
     void (*hcscale_fast)(struct SwsContext *c,
305 
-                         int16_t *dst1, int16_t *dst2, long dstWidth,
305 
+                         int16_t *dst1, int16_t *dst2, int dstWidth,
306 306 
                          const uint8_t *src1, const uint8_t *src2,
307 307 
                          int srcW, int xInc);
308 308
309 309 
     void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW,
310 310 
                    int xInc, const int16_t *filter, const int16_t *filterPos,
311 
-                   long filterSize);
311 
+                   int filterSize);
312 312
313 313 
     void (*lumConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for luma plane if needed.
314 314 
     void (*chrConvertRange)(uint16_t *dst1, uint16_t *dst2, int width); ///< Color range conversion function for chroma planes if needed.
libswscale/swscale_template.c
History View file @ b8e8933
... ... 
@@ -24,7 +24,7 @@ static inline void yuv2yuvX_c(SwsContext *c, const int16_t *lumFilter,
24 24 
                               const int16_t **chrVSrc,
25 25 
                               int chrFilterSize, const int16_t **alpSrc,
26 26 
                               uint8_t *dest, uint8_t *uDest, uint8_t *vDest,
27 
-                              uint8_t *aDest, long dstW, long chrDstW)
27 
+                              uint8_t *aDest, int dstW, int chrDstW)
28 28 
 {
29 29 
     yuv2yuvXinC(lumFilter, lumSrc, lumFilterSize,
30 30 
                 chrFilter, chrUSrc, chrVSrc, chrFilterSize,
... ... 
@@ -47,7 +47,7 @@ static inline void yuv2yuv1_c(SwsContext *c, const int16_t *lumSrc,
47 47 
                               const int16_t *chrUSrc, const int16_t *chrVSrc,
48 48 
                               const int16_t *alpSrc,
49 49 
                               uint8_t *dest, uint8_t *uDest, uint8_t *vDest,
50 
-                              uint8_t *aDest, long dstW, long chrDstW)
50 
+                              uint8_t *aDest, int dstW, int chrDstW)
51 51 
 {
52 52 
     int i;
53 53 
     for (i=0; i<dstW; i++) {
... ... 
@@ -79,7 +79,7 @@ static inline void yuv2packedX_c(SwsContext *c, const int16_t *lumFilter,
79 79 
                                  const int16_t *chrFilter, const int16_t **chrUSrc,
80 80 
                                  const int16_t **chrVSrc,
81 81 
                                  int chrFilterSize, const int16_t **alpSrc,
82 
-                                 uint8_t *dest, long dstW, long dstY)
82 
+                                 uint8_t *dest, int dstW, int dstY)
83 83 
 {
84 84 
         yuv2packedXinC(c, lumFilter, lumSrc, lumFilterSize,
85 85 
                        chrFilter, chrUSrc, chrVSrc, chrFilterSize,
... ... 
@@ -128,7 +128,7 @@ static inline void yuv2packed1_c(SwsContext *c, const uint16_t *buf0,
128 128
129 129 
 //FIXME yuy2* can read up to 7 samples too much
130 130
131 
-static inline void yuy2ToY_c(uint8_t *dst, const uint8_t *src, long width,
131 
+static inline void yuy2ToY_c(uint8_t *dst, const uint8_t *src, int width,
132 132 
                              uint32_t *unused)
133 133 
 {
134 134 
     int i;
... ... 
@@ -137,7 +137,7 @@ static inline void yuy2ToY_c(uint8_t *dst, const uint8_t *src, long width,
137 137 
 }
138 138
139 139 
 static inline void yuy2ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
140 
-                              const uint8_t *src2, long width, uint32_t *unused)
140 
+                              const uint8_t *src2, int width, uint32_t *unused)
141 141 
 {
142 142 
     int i;
143 143 
     for (i=0; i<width; i++) {
... ... 
@@ -148,7 +148,7 @@ static inline void yuy2ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
148 148 
 }
149 149
150 150 
 static inline void LEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
151 
-                            const uint8_t *src2, long width, uint32_t *unused)
151 
+                            const uint8_t *src2, int width, uint32_t *unused)
152 152 
 {
153 153 
     int i;
154 154 
     // FIXME I don't think this code is right for YUV444/422, since then h is not subsampled so
... ... 
@@ -161,7 +161,7 @@ static inline void LEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
161 161
162 162 
 /* This is almost identical to the previous, end exists only because
163 163 
  * yuy2ToY/UV)(dst, src+1, ...) would have 100% unaligned accesses. */
164 
-static inline void uyvyToY_c(uint8_t *dst, const uint8_t *src, long width,
164 
+static inline void uyvyToY_c(uint8_t *dst, const uint8_t *src, int width,
165 165 
                              uint32_t *unused)
166 166 
 {
167 167 
     int i;
... ... 
@@ -170,7 +170,7 @@ static inline void uyvyToY_c(uint8_t *dst, const uint8_t *src, long width,
170 170 
 }
171 171
172 172 
 static inline void uyvyToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
173 
-                              const uint8_t *src2, long width, uint32_t *unused)
173 
+                              const uint8_t *src2, int width, uint32_t *unused)
174 174 
 {
175 175 
     int i;
176 176 
     for (i=0; i<width; i++) {
... ... 
@@ -181,7 +181,7 @@ static inline void uyvyToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
181 181 
 }
182 182
183 183 
 static inline void BEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
184 
-                            const uint8_t *src2, long width, uint32_t *unused)
184 
+                            const uint8_t *src2, int width, uint32_t *unused)
185 185 
 {
186 186 
     int i;
187 187 
     for (i=0; i<width; i++) {
... ... 
@@ -191,7 +191,7 @@ static inline void BEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
191 191 
 }
192 192
193 193 
 static inline void nvXXtoUV_c(uint8_t *dst1, uint8_t *dst2,
194 
-                              const uint8_t *src, long width)
194 
+                              const uint8_t *src, int width)
195 195 
 {
196 196 
     int i;
197 197 
     for (i = 0; i < width; i++) {
... ... 
@@ -202,14 +202,14 @@ static inline void nvXXtoUV_c(uint8_t *dst1, uint8_t *dst2,
202 202
203 203 
 static inline void nv12ToUV_c(uint8_t *dstU, uint8_t *dstV,
204 204 
                               const uint8_t *src1, const uint8_t *src2,
205 
-                              long width, uint32_t *unused)
205 
+                              int width, uint32_t *unused)
206 206 
 {
207 207 
     nvXXtoUV_c(dstU, dstV, src1, width);
208 208 
 }
209 209
210 210 
 static inline void nv21ToUV_c(uint8_t *dstU, uint8_t *dstV,
211 211 
                               const uint8_t *src1, const uint8_t *src2,
212 
-                              long width, uint32_t *unused)
212 
+                              int width, uint32_t *unused)
213 213 
 {
214 214 
     nvXXtoUV_c(dstV, dstU, src1, width);
215 215 
 }
... ... 
@@ -218,7 +218,7 @@ static inline void nv21ToUV_c(uint8_t *dstU, uint8_t *dstV,
218 218 
 #define YUV_NBPS(depth, endianness, rfunc) \
219 219 
 static inline void endianness ## depth ## ToUV_c(uint8_t *dstU, uint8_t *dstV, \
220 220 
                                           const uint8_t *_srcU, const uint8_t *_srcV, \
221 
-                                          long width, uint32_t *unused) \
221 
+                                          int width, uint32_t *unused) \
222 222 
 { \
223 223 
     int i; \
224 224 
     const uint16_t *srcU = (const uint16_t*)_srcU; \
... ... 
@@ -229,7 +229,7 @@ static inline void endianness ## depth ## ToUV_c(uint8_t *dstU, uint8_t *dstV, \
229 229 
     } \
230 230 
 } \
231 231 
 \
232 
-static inline void endianness ## depth ## ToY_c(uint8_t *dstY, const uint8_t *_srcY, long width, uint32_t *unused) \
232 
+static inline void endianness ## depth ## ToY_c(uint8_t *dstY, const uint8_t *_srcY, int width, uint32_t *unused) \
233 233 
 { \
234 234 
     int i; \
235 235 
     const uint16_t *srcY = (const uint16_t*)_srcY; \
... ... 
@@ -243,7 +243,7 @@ YUV_NBPS(10, LE, AV_RL16)
243 243 
 YUV_NBPS(10, BE, AV_RB16)
244 244
245 245 
 static inline void bgr24ToY_c(uint8_t *dst, const uint8_t *src,
246 
-                              long width, uint32_t *unused)
246 
+                              int width, uint32_t *unused)
247 247 
 {
248 248 
     int i;
249 249 
     for (i=0; i<width; i++) {
... ... 
@@ -256,7 +256,7 @@ static inline void bgr24ToY_c(uint8_t *dst, const uint8_t *src,
256 256 
 }
257 257
258 258 
 static inline void bgr24ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
259 
-                               const uint8_t *src2, long width, uint32_t *unused)
259 
+                               const uint8_t *src2, int width, uint32_t *unused)
260 260 
 {
261 261 
     int i;
262 262 
     for (i=0; i<width; i++) {
... ... 
@@ -271,7 +271,7 @@ static inline void bgr24ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1
271 271 
 }
272 272
273 273 
 static inline void bgr24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
274 
-                                    const uint8_t *src2, long width, uint32_t *unused)
274 
+                                    const uint8_t *src2, int width, uint32_t *unused)
275 275 
 {
276 276 
     int i;
277 277 
     for (i=0; i<width; i++) {
... ... 
@@ -285,7 +285,7 @@ static inline void bgr24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const uint8_t
285 285 
     assert(src1 == src2);
286 286 
 }
287 287
288 
-static inline void rgb24ToY_c(uint8_t *dst, const uint8_t *src, long width,
288 
+static inline void rgb24ToY_c(uint8_t *dst, const uint8_t *src, int width,
289 289 
                               uint32_t *unused)
290 290 
 {
291 291 
     int i;
... ... 
@@ -299,7 +299,7 @@ static inline void rgb24ToY_c(uint8_t *dst, const uint8_t *src, long width,
299 299 
 }
300 300
301 301 
 static inline void rgb24ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
302 
-                               const uint8_t *src2, long width, uint32_t *unused)
302 
+                               const uint8_t *src2, int width, uint32_t *unused)
303 303 
 {
304 304 
     int i;
305 305 
     assert(src1==src2);
... ... 
@@ -314,7 +314,7 @@ static inline void rgb24ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1
314 314 
 }
315 315
316 316 
 static inline void rgb24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
317 
-                                    const uint8_t *src2, long width, uint32_t *unused)
317 
+                                    const uint8_t *src2, int width, uint32_t *unused)
318 318 
 {
319 319 
     int i;
320 320 
     assert(src1==src2);
... ... 
@@ -333,7 +333,7 @@ static inline void rgb24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const uint8_t
333 333 
 static inline void hScale_c(int16_t *dst, int dstW, const uint8_t *src,
334 334 
                             int srcW, int xInc,
335 335 
                             const int16_t *filter, const int16_t *filterPos,
336 
-                            long filterSize)
336 
+                            int filterSize)
337 337 
 {
338 338 
     int i;
339 339 
     for (i=0; i<dstW; i++) {
... ... 
@@ -380,7 +380,7 @@ static void lumRangeFromJpeg_c(uint16_t *dst, int width)
380 380 
         dst[i] = (dst[i]*14071 + 33561947)>>14;
381 381 
 }
382 382
383 
-static inline void hyscale_fast_c(SwsContext *c, int16_t *dst, long dstWidth,
383 
+static inline void hyscale_fast_c(SwsContext *c, int16_t *dst, int dstWidth,
384 384 
                                   const uint8_t *src, int srcW, int xInc)
385 385 
 {
386 386 
     int i;
... ... 
@@ -394,14 +394,14 @@ static inline void hyscale_fast_c(SwsContext *c, int16_t *dst, long dstWidth,
394 394 
 }
395 395
396 396 
       // *** horizontal scale Y line to temp buffer
397 
-static inline void hyscale_c(SwsContext *c, uint16_t *dst, long dstWidth,
397 
+static inline void hyscale_c(SwsContext *c, uint16_t *dst, int dstWidth,
398 398 
                              const uint8_t *src, int srcW, int xInc,
399 399 
                              const int16_t *hLumFilter,
400 400 
                              const int16_t *hLumFilterPos, int hLumFilterSize,
401 401 
                              uint8_t *formatConvBuffer,
402 402 
                              uint32_t *pal, int isAlpha)
403 403 
 {
404 
-    void (*toYV12)(uint8_t *, const uint8_t *, long, uint32_t *) = isAlpha ? c->alpToYV12 : c->lumToYV12;
404 
+    void (*toYV12)(uint8_t *, const uint8_t *, int, uint32_t *) = isAlpha ? c->alpToYV12 : c->lumToYV12;
405 405 
     void (*convertRange)(uint16_t *, int) = isAlpha ? NULL : c->lumConvertRange;
406 406
407 407 
     src += isAlpha ? c->alpSrcOffset : c->lumSrcOffset;
... ... 
@@ -422,7 +422,7 @@ static inline void hyscale_c(SwsContext *c, uint16_t *dst, long dstWidth,
422 422 
 }
423 423
424 424 
 static inline void hcscale_fast_c(SwsContext *c, int16_t *dst1, int16_t *dst2,
425 
-                                  long dstWidth, const uint8_t *src1,
425 
+                                  int dstWidth, const uint8_t *src1,
426 426 
                                   const uint8_t *src2, int srcW, int xInc)
427 427 
 {
428 428 
     int i;
... ... 
@@ -436,7 +436,7 @@ static inline void hcscale_fast_c(SwsContext *c, int16_t *dst1, int16_t *dst2,
436 436 
     }
437 437 
 }
438 438
439 
-inline static void hcscale_c(SwsContext *c, uint16_t *dst1, uint16_t *dst2, long dstWidth,
439 
+inline static void hcscale_c(SwsContext *c, uint16_t *dst1, uint16_t *dst2, int dstWidth,
440 440 
                              const uint8_t *src1, const uint8_t *src2,
441 441 
                              int srcW, int xInc, const int16_t *hChrFilter,
442 442 
                              const int16_t *hChrFilterPos, int hChrFilterSize,
libswscale/x86/rgb2rgb_template.c
History View file @ b8e8933
... ... 
@@ -61,7 +61,7 @@
61 61
62 62 
 #if !COMPILE_TEMPLATE_AMD3DNOW
63 63
64 
-static inline void RENAME(rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long src_size)
64 
+static inline void RENAME(rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size)
65 65 
 {
66 66 
     uint8_t *dest = dst;
67 67 
     const uint8_t *s = src;
... ... 
@@ -143,7 +143,7 @@ static inline void RENAME(rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long s
143 143 
             MOVNTQ"     %%mm4, 16%0"
144 144
145 145
146 
-static inline void RENAME(rgb32tobgr24)(const uint8_t *src, uint8_t *dst, long src_size)
146 
+static inline void RENAME(rgb32tobgr24)(const uint8_t *src, uint8_t *dst, int src_size)
147 147 
 {
148 148 
     uint8_t *dest = dst;
149 149 
     const uint8_t *s = src;
... ... 
@@ -186,7 +186,7 @@ static inline void RENAME(rgb32tobgr24)(const uint8_t *src, uint8_t *dst, long s
186 186 
  MMX2, 3DNOW optimization by Nick Kurshev
187 187 
  32-bit C version, and and&add trick by Michael Niedermayer
188 188 
 */
189 
-static inline void RENAME(rgb15to16)(const uint8_t *src, uint8_t *dst, long src_size)
189 
+static inline void RENAME(rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size)
190 190 
 {
191 191 
     register const uint8_t* s=src;
192 192 
     register uint8_t* d=dst;
... ... 
@@ -230,7 +230,7 @@ static inline void RENAME(rgb15to16)(const uint8_t *src, uint8_t *dst, long src_
230 230 
     }
231 231 
 }
232 232
233 
-static inline void RENAME(rgb16to15)(const uint8_t *src, uint8_t *dst, long src_size)
233 
+static inline void RENAME(rgb16to15)(const uint8_t *src, uint8_t *dst, int src_size)
234 234 
 {
235 235 
     register const uint8_t* s=src;
236 236 
     register uint8_t* d=dst;
... ... 
@@ -279,7 +279,7 @@ static inline void RENAME(rgb16to15)(const uint8_t *src, uint8_t *dst, long src_
279 279 
     }
280 280 
 }
281 281
282 
-static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, long src_size)
282 
+static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, int src_size)
283 283 
 {
284 284 
     const uint8_t *s = src;
285 285 
     const uint8_t *end;
... ... 
@@ -371,7 +371,7 @@ static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, long src_
371 371 
     }
372 372 
 }
373 373
374 
-static inline void RENAME(rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size)
374 
+static inline void RENAME(rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size)
375 375 
 {
376 376 
     const uint8_t *s = src;
377 377 
     const uint8_t *end;
... ... 
@@ -426,7 +426,7 @@ static inline void RENAME(rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long s
426 426 
     }
427 427 
 }
428 428
429 
-static inline void RENAME(rgb32to15)(const uint8_t *src, uint8_t *dst, long src_size)
429 
+static inline void RENAME(rgb32to15)(const uint8_t *src, uint8_t *dst, int src_size)
430 430 
 {
431 431 
     const uint8_t *s = src;
432 432 
     const uint8_t *end;
... ... 
@@ -518,7 +518,7 @@ static inline void RENAME(rgb32to15)(const uint8_t *src, uint8_t *dst, long src_
518 518 
     }
519 519 
 }
520 520
521 
-static inline void RENAME(rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size)
521 
+static inline void RENAME(rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size)
522 522 
 {
523 523 
     const uint8_t *s = src;
524 524 
     const uint8_t *end;
... ... 
@@ -573,7 +573,7 @@ static inline void RENAME(rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long s
573 573 
     }
574 574 
 }
575 575
576 
-static inline void RENAME(rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size)
576 
+static inline void RENAME(rgb24tobgr16)(const uint8_t *src, uint8_t *dst, int src_size)
577 577 
 {
578 578 
     const uint8_t *s = src;
579 579 
     const uint8_t *end;
... ... 
@@ -630,7 +630,7 @@ static inline void RENAME(rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long s
630 630 
     }
631 631 
 }
632 632
633 
-static inline void RENAME(rgb24to16)(const uint8_t *src, uint8_t *dst, long src_size)
633 
+static inline void RENAME(rgb24to16)(const uint8_t *src, uint8_t *dst, int src_size)
634 634 
 {
635 635 
     const uint8_t *s = src;
636 636 
     const uint8_t *end;
... ... 
@@ -687,7 +687,7 @@ static inline void RENAME(rgb24to16)(const uint8_t *src, uint8_t *dst, long src_
687 687 
     }
688 688 
 }
689 689
690 
-static inline void RENAME(rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long src_size)
690 
+static inline void RENAME(rgb24tobgr15)(const uint8_t *src, uint8_t *dst, int src_size)
691 691 
 {
692 692 
     const uint8_t *s = src;
693 693 
     const uint8_t *end;
... ... 
@@ -744,7 +744,7 @@ static inline void RENAME(rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long s
744 744 
     }
745 745 
 }
746 746
747 
-static inline void RENAME(rgb24to15)(const uint8_t *src, uint8_t *dst, long src_size)
747 
+static inline void RENAME(rgb24to15)(const uint8_t *src, uint8_t *dst, int src_size)
748 748 
 {
749 749 
     const uint8_t *s = src;
750 750 
     const uint8_t *end;
... ... 
@@ -822,7 +822,7 @@ static inline void RENAME(rgb24to15)(const uint8_t *src, uint8_t *dst, long src_
822 822 
        |
823 823 
    original bits
824 824 
 */
825 
-static inline void RENAME(rgb15tobgr24)(const uint8_t *src, uint8_t *dst, long src_size)
825 
+static inline void RENAME(rgb15tobgr24)(const uint8_t *src, uint8_t *dst, int src_size)
826 826 
 {
827 827 
     const uint16_t *end;
828 828 
     const uint16_t *mm_end;
... ... 
@@ -925,7 +925,7 @@ static inline void RENAME(rgb15tobgr24)(const uint8_t *src, uint8_t *dst, long s
925 925 
     }
926 926 
 }
927 927
928 
-static inline void RENAME(rgb16tobgr24)(const uint8_t *src, uint8_t *dst, long src_size)
928 
+static inline void RENAME(rgb16tobgr24)(const uint8_t *src, uint8_t *dst, int src_size)
929 929 
 {
930 930 
     const uint16_t *end;
931 931 
     const uint16_t *mm_end;
... ... 
@@ -1046,7 +1046,7 @@ static inline void RENAME(rgb16tobgr24)(const uint8_t *src, uint8_t *dst, long s
1046 1046 
     MOVNTQ"     %%mm0,  %0      \n\t"                               \
1047 1047 
     MOVNTQ"     %%mm3, 8%0      \n\t"                               \
1048 1048
1049 
-static inline void RENAME(rgb15to32)(const uint8_t *src, uint8_t *dst, long src_size)
1049 
+static inline void RENAME(rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size)
1050 1050 
 {
1051 1051 
     const uint16_t *end;
1052 1052 
     const uint16_t *mm_end;
... ... 
@@ -1088,7 +1088,7 @@ static inline void RENAME(rgb15to32)(const uint8_t *src, uint8_t *dst, long src_
1088 1088 
     }
1089 1089 
 }
1090 1090
1091 
-static inline void RENAME(rgb16to32)(const uint8_t *src, uint8_t *dst, long src_size)
1091 
+static inline void RENAME(rgb16to32)(const uint8_t *src, uint8_t *dst, int src_size)
1092 1092 
 {
1093 1093 
     const uint16_t *end;
1094 1094 
     const uint16_t *mm_end;
... ... 
@@ -1130,7 +1130,7 @@ static inline void RENAME(rgb16to32)(const uint8_t *src, uint8_t *dst, long src_
1130 1130 
     }
1131 1131 
 }
1132 1132
1133 
-static inline void RENAME(shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, long src_size)
1133 
+static inline void RENAME(shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size)
1134 1134 
 {
1135 1135 
     x86_reg idx = 15 - src_size;
1136 1136 
     const uint8_t *s = src-idx;
... ... 
@@ -1192,7 +1192,7 @@ static inline void RENAME(shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst,
1192 1192 
     }
1193 1193 
 }
1194 1194
1195 
-static inline void RENAME(rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size)
1195 
+static inline void RENAME(rgb24tobgr24)(const uint8_t *src, uint8_t *dst, int src_size)
1196 1196 
 {
1197 1197 
     unsigned i;
1198 1198 
     x86_reg mmx_size= 23 - src_size;
... ... 
@@ -1260,10 +1260,10 @@ static inline void RENAME(rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long s
1260 1260 
 }
1261 1261
1262 1262 
 static inline void RENAME(yuvPlanartoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
1263 
-                                           long width, long height,
1264 
-                                           long lumStride, long chromStride, long dstStride, long vertLumPerChroma)
1263 
+                                           int width, int height,
1264 
+                                           int lumStride, int chromStride, int dstStride, int vertLumPerChroma)
1265 1265 
 {
1266 
-    long y;
1266 
+    int y;
1267 1267 
     const x86_reg chromWidth= width>>1;
1268 1268 
     for (y=0; y<height; y++) {
1269 1269 
         //FIXME handle 2 lines at once (fewer prefetches, reuse some chroma, but very likely memory-limited anyway)
... ... 
@@ -1317,18 +1317,18 @@ static inline void RENAME(yuvPlanartoyuy2)(const uint8_t *ysrc, const uint8_t *u
1317 1317 
  * (If this is a problem for anyone then tell me, and I will fix it.)
1318 1318 
  */
1319 1319 
 static inline void RENAME(yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
1320 
-                                      long width, long height,
1321 
-                                      long lumStride, long chromStride, long dstStride)
1320 
+                                      int width, int height,
1321 
+                                      int lumStride, int chromStride, int dstStride)
1322 1322 
 {
1323 1323 
     //FIXME interpolate chroma
1324 1324 
     RENAME(yuvPlanartoyuy2)(ysrc, usrc, vsrc, dst, width, height, lumStride, chromStride, dstStride, 2);
1325 1325 
 }
1326 1326
1327 1327 
 static inline void RENAME(yuvPlanartouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
1328 
-                                           long width, long height,
1329 
-                                           long lumStride, long chromStride, long dstStride, long vertLumPerChroma)
1328 
+                                           int width, int height,
1329 
+                                           int lumStride, int chromStride, int dstStride, int vertLumPerChroma)
1330 1330 
 {
1331 
-    long y;
1331 
+    int y;
1332 1332 
     const x86_reg chromWidth= width>>1;
1333 1333 
     for (y=0; y<height; y++) {
1334 1334 
         //FIXME handle 2 lines at once (fewer prefetches, reuse some chroma, but very likely memory-limited anyway)
... ... 
@@ -1382,8 +1382,8 @@ static inline void RENAME(yuvPlanartouyvy)(const uint8_t *ysrc, const uint8_t *u
1382 1382 
  * (If this is a problem for anyone then tell me, and I will fix it.)
1383 1383 
  */
1384 1384 
 static inline void RENAME(yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
1385 
-                                      long width, long height,
1386 
-                                      long lumStride, long chromStride, long dstStride)
1385 
+                                      int width, int height,
1386 
+                                      int lumStride, int chromStride, int dstStride)
1387 1387 
 {
1388 1388 
     //FIXME interpolate chroma
1389 1389 
     RENAME(yuvPlanartouyvy)(ysrc, usrc, vsrc, dst, width, height, lumStride, chromStride, dstStride, 2);
... ... 
@@ -1393,8 +1393,8 @@ static inline void RENAME(yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc,
1393 1393 
  * Width should be a multiple of 16.
1394 1394 
  */
1395 1395 
 static inline void RENAME(yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
1396 
-                                         long width, long height,
1397 
-                                         long lumStride, long chromStride, long dstStride)
1396 
+                                         int width, int height,
1397 
+                                         int lumStride, int chromStride, int dstStride)
1398 1398 
 {
1399 1399 
     RENAME(yuvPlanartouyvy)(ysrc, usrc, vsrc, dst, width, height, lumStride, chromStride, dstStride, 1);
1400 1400 
 }
... ... 
@@ -1403,8 +1403,8 @@ static inline void RENAME(yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usr
1403 1403 
  * Width should be a multiple of 16.
1404 1404 
  */
1405 1405 
 static inline void RENAME(yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
1406 
-                                         long width, long height,
1407 
-                                         long lumStride, long chromStride, long dstStride)
1406 
+                                         int width, int height,
1407 
+                                         int lumStride, int chromStride, int dstStride)
1408 1408 
 {
1409 1409 
     RENAME(yuvPlanartoyuy2)(ysrc, usrc, vsrc, dst, width, height, lumStride, chromStride, dstStride, 1);
1410 1410 
 }
... ... 
@@ -1414,10 +1414,10 @@ static inline void RENAME(yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usr
1414 1414 
  * (If this is a problem for anyone then tell me, and I will fix it.)
1415 1415 
  */
1416 1416 
 static inline void RENAME(yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
1417 
-                                      long width, long height,
1418 
-                                      long lumStride, long chromStride, long srcStride)
1417 
+                                      int width, int height,
1418 
+                                      int lumStride, int chromStride, int srcStride)
1419 1419 
 {
1420 
-    long y;
1420 
+    int y;
1421 1421 
     const x86_reg chromWidth= width>>1;
1422 1422 
     for (y=0; y<height; y+=2) {
1423 1423 
         __asm__ volatile(
... ... 
@@ -1513,9 +1513,9 @@ static inline void RENAME(yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
1513 1513 
 #endif /* !COMPILE_TEMPLATE_AMD3DNOW */
1514 1514
1515 1515 
 #if COMPILE_TEMPLATE_MMX2 || COMPILE_TEMPLATE_AMD3DNOW
1516 
-static inline void RENAME(planar2x)(const uint8_t *src, uint8_t *dst, long srcWidth, long srcHeight, long srcStride, long dstStride)
1516 
+static inline void RENAME(planar2x)(const uint8_t *src, uint8_t *dst, int srcWidth, int srcHeight, int srcStride, int dstStride)
1517 1517 
 {
1518 
-    long x,y;
1518 
+    int x,y;
1519 1519
1520 1520 
     dst[0]= src[0];
1521 1521
... ... 
@@ -1612,10 +1612,10 @@ static inline void RENAME(planar2x)(const uint8_t *src, uint8_t *dst, long srcWi
1612 1612 
  * FIXME: Write HQ version.
1613 1613 
  */
1614 1614 
 static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
1615 
-                                      long width, long height,
1616 
-                                      long lumStride, long chromStride, long srcStride)
1615 
+                                      int width, int height,
1616 
+                                      int lumStride, int chromStride, int srcStride)
1617 1617 
 {
1618 
-    long y;
1618 
+    int y;
1619 1619 
     const x86_reg chromWidth= width>>1;
1620 1620 
     for (y=0; y<height; y+=2) {
1621 1621 
         __asm__ volatile(
... ... 
@@ -1718,13 +1718,13 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
1718 1718 
  * FIXME: Write HQ version.
1719 1719 
  */
1720 1720 
 static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
1721 
-                                       long width, long height,
1722 
-                                       long lumStride, long chromStride, long srcStride)
1721 
+                                       int width, int height,
1722 
+                                       int lumStride, int chromStride, int srcStride)
1723 1723 
 {
1724 
-    long y;
1724 
+    int y;
1725 1725 
     const x86_reg chromWidth= width>>1;
1726 1726 
     for (y=0; y<height-2; y+=2) {
1727 
-        long i;
1727 
+        int i;
1728 1728 
         for (i=0; i<2; i++) {
1729 1729 
             __asm__ volatile(
1730 1730 
                 "mov                        %2, %%"REG_a"   \n\t"
... ... 
@@ -1963,13 +1963,13 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
1963 1963
1964 1964 
 #if !COMPILE_TEMPLATE_AMD3DNOW
1965 1965 
 static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dest,
1966 
-                                    long width, long height, long src1Stride,
1967 
-                                    long src2Stride, long dstStride)
1966 
+                                    int width, int height, int src1Stride,
1967 
+                                    int src2Stride, int dstStride)
1968 1968 
 {
1969 
-    long h;
1969 
+    int h;
1970 1970
1971 1971 
     for (h=0; h < height; h++) {
1972 
-        long w;
1972 
+        int w;
1973 1973
1974 1974 
 #if COMPILE_TEMPLATE_SSE2
1975 1975 
         __asm__(
... ... 
@@ -2037,12 +2037,12 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui
2037 2037 
 #if !COMPILE_TEMPLATE_AMD3DNOW
2038 2038 
 static inline void RENAME(vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
2039 2039 
                                        uint8_t *dst1, uint8_t *dst2,
2040 
-                                       long width, long height,
2041 
-                                       long srcStride1, long srcStride2,
2042 
-                                       long dstStride1, long dstStride2)
2040 
+                                       int width, int height,
2041 
+                                       int srcStride1, int srcStride2,
2042 
+                                       int dstStride1, int dstStride2)
2043 2043 
 {
2044 2044 
     x86_reg y;
2045 
-    long x,w,h;
2045 
+    int x,w,h;
2046 2046 
     w=width/2; h=height/2;
2047 2047 
     __asm__ volatile(
2048 2048 
         PREFETCH" %0    \n\t"
... ... 
@@ -2131,12 +2131,12 @@ static inline void RENAME(vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
2131 2131
2132 2132 
 static inline void RENAME(yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
2133 2133 
                                         uint8_t *dst,
2134 
-                                        long width, long height,
2135 
-                                        long srcStride1, long srcStride2,
2136 
-                                        long srcStride3, long dstStride)
2134 
+                                        int width, int height,
2135 
+                                        int srcStride1, int srcStride2,
2136 
+                                        int srcStride3, int dstStride)
2137 2137 
 {
2138 2138 
     x86_reg x;
2139 
-    long y,w,h;
2139 
+    int y,w,h;
2140 2140 
     w=width/2; h=height;
2141 2141 
     for (y=0;y<h;y++) {
2142 2142 
         const uint8_t* yp=src1+srcStride1*y;
... ... 
@@ -2197,7 +2197,7 @@ static inline void RENAME(yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2
2197 2197 
                 :"memory");
2198 2198 
         }
2199 2199 
         for (; x<w; x++) {
2200 
-            const long x2 = x<<2;
2200 
+            const int x2 = x<<2;
2201 2201 
             d[8*x+0] = yp[x2];
2202 2202 
             d[8*x+1] = up[x];
2203 2203 
             d[8*x+2] = yp[x2+1];
... ... 
@@ -2459,11 +2459,11 @@ static void RENAME(extract_odd2avg)(const uint8_t *src0, const uint8_t *src1, ui
2459 2459 
 }
2460 2460
2461 2461 
 static void RENAME(yuyvtoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
2462 
-                                 long width, long height,
2463 
-                                 long lumStride, long chromStride, long srcStride)
2462 
+                                 int width, int height,
2463 
+                                 int lumStride, int chromStride, int srcStride)
2464 2464 
 {
2465 
-    long y;
2466 
-    const long chromWidth= -((-width)>>1);
2465 
+    int y;
2466 
+    const int chromWidth= -((-width)>>1);
2467 2467
2468 2468 
     for (y=0; y<height; y++) {
2469 2469 
         RENAME(extract_even)(src, ydst, width);
... ... 
@@ -2485,11 +2485,11 @@ static void RENAME(yuyvtoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co
2485 2485
2486 2486 
 #if !COMPILE_TEMPLATE_AMD3DNOW
2487 2487 
 static void RENAME(yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
2488 
-                                 long width, long height,
2489 
-                                 long lumStride, long chromStride, long srcStride)
2488 
+                                 int width, int height,
2489 
+                                 int lumStride, int chromStride, int srcStride)
2490 2490 
 {
2491 
-    long y;
2492 
-    const long chromWidth= -((-width)>>1);
2491 
+    int y;
2492 
+    const int chromWidth= -((-width)>>1);
2493 2493
2494 2494 
     for (y=0; y<height; y++) {
2495 2495 
         RENAME(extract_even)(src, ydst, width);
... ... 
@@ -2509,11 +2509,11 @@ static void RENAME(yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co
2509 2509 
 #endif /* !COMPILE_TEMPLATE_AMD3DNOW */
2510 2510
2511 2511 
 static void RENAME(uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
2512 
-                                 long width, long height,
2513 
-                                 long lumStride, long chromStride, long srcStride)
2512 
+                                 int width, int height,
2513 
+                                 int lumStride, int chromStride, int srcStride)
2514 2514 
 {
2515 
-    long y;
2516 
-    const long chromWidth= -((-width)>>1);
2515 
+    int y;
2516 
+    const int chromWidth= -((-width)>>1);
2517 2517
2518 2518 
     for (y=0; y<height; y++) {
2519 2519 
         RENAME(extract_even)(src+1, ydst, width);
... ... 
@@ -2535,11 +2535,11 @@ static void RENAME(uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co
2535 2535
2536 2536 
 #if !COMPILE_TEMPLATE_AMD3DNOW
2537 2537 
 static void RENAME(uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src,
2538 
-                                 long width, long height,
2539 
-                                 long lumStride, long chromStride, long srcStride)
2538 
+                                 int width, int height,
2539 
+                                 int lumStride, int chromStride, int srcStride)
2540 2540 
 {
2541 
-    long y;
2542 
-    const long chromWidth= -((-width)>>1);
2541 
+    int y;
2542 
+    const int chromWidth= -((-width)>>1);
2543 2543
2544 2544 
     for (y=0; y<height; y++) {
2545 2545 
         RENAME(extract_even)(src+1, ydst, width);
libswscale/x86/swscale_template.c
History View file @ b8e8933
... ... 
@@ -78,7 +78,7 @@ static inline void RENAME(yuv2yuvX)(SwsContext *c, const int16_t *lumFilter,
78 78 
                                     const int16_t **chrVSrc,
79 79 
                                     int chrFilterSize, const int16_t **alpSrc,
80 80 
                                     uint8_t *dest, uint8_t *uDest, uint8_t *vDest,
81 
-                                    uint8_t *aDest, long dstW, long chrDstW)
81 
+                                    uint8_t *aDest, int dstW, int chrDstW)
82 82 
 {
83 83 
     if (uDest) {
84 84 
         x86_reg uv_off = c->uv_off;
... ... 
@@ -159,7 +159,7 @@ static inline void RENAME(yuv2yuvX_ar)(SwsContext *c, const int16_t *lumFilter,
159 159 
                                        const int16_t **chrVSrc,
160 160 
                                        int chrFilterSize, const int16_t **alpSrc,
161 161 
                                        uint8_t *dest, uint8_t *uDest, uint8_t *vDest,
162 
-                                       uint8_t *aDest, long dstW, long chrDstW)
162 
+                                       uint8_t *aDest, int dstW, int chrDstW)
163 163 
 {
164 164 
     if (uDest) {
165 165 
         x86_reg uv_off = c->uv_off;
... ... 
@@ -190,9 +190,9 @@ static inline void RENAME(yuv2yuv1)(SwsContext *c, const int16_t *lumSrc,
190 190 
                                     const int16_t *chrUSrc, const int16_t *chrVSrc,
191 191 
                                     const int16_t *alpSrc,
192 192 
                                     uint8_t *dest, uint8_t *uDest, uint8_t *vDest,
193 
-                                    uint8_t *aDest, long dstW, long chrDstW)
193 
+                                    uint8_t *aDest, int dstW, int chrDstW)
194 194 
 {
195 
-    long p= 4;
195 
+    int p= 4;
196 196 
     const uint8_t *src[4]= { alpSrc + dstW, lumSrc + dstW, chrUSrc + chrDstW, chrVSrc + chrDstW };
197 197 
     uint8_t *dst[4]= { aDest, dest, uDest, vDest };
198 198 
     x86_reg counter[4]= { dstW, dstW, chrDstW, chrDstW };
... ... 
@@ -231,9 +231,9 @@ static inline void RENAME(yuv2yuv1_ar)(SwsContext *c, const int16_t *lumSrc,
231 231 
                                        const int16_t *chrUSrc, const int16_t *chrVSrc,
232 232 
                                        const int16_t *alpSrc,
233 233 
                                        uint8_t *dest, uint8_t *uDest, uint8_t *vDest,
234 
-                                       uint8_t *aDest, long dstW, long chrDstW)
234 
+                                       uint8_t *aDest, int dstW, int chrDstW)
235 235 
 {
236 
-    long p= 4;
236 
+    int p= 4;
237 237 
     const uint8_t *src[4]= { alpSrc + dstW, lumSrc + dstW, chrUSrc + chrDstW, chrVSrc + chrDstW };
238 238 
     uint8_t *dst[4]= { aDest, dest, uDest, vDest };
239 239 
     x86_reg counter[4]= { dstW, dstW, chrDstW, chrDstW };
... ... 
@@ -471,7 +471,7 @@ static inline void RENAME(yuv2rgb32_X_ar)(SwsContext *c, const int16_t *lumFilte
471 471 
                                           const int16_t *chrFilter, const int16_t **chrUSrc,
472 472 
                                           const int16_t **chrVSrc,
473 473 
                                           int chrFilterSize, const int16_t **alpSrc,
474 
-                                          uint8_t *dest, long dstW, long dstY)
474 
+                                          uint8_t *dest, int dstW, int dstY)
475 475 
 {
476 476 
     x86_reg dummy=0;
477 477 
     x86_reg dstW_reg = dstW;
... ... 
@@ -504,7 +504,7 @@ static inline void RENAME(yuv2rgb32_X)(SwsContext *c, const int16_t *lumFilter,
504 504 
                                        const int16_t *chrFilter, const int16_t **chrUSrc,
505 505 
                                        const int16_t **chrVSrc,
506 506 
                                        int chrFilterSize, const int16_t **alpSrc,
507 
-                                       uint8_t *dest, long dstW, long dstY)
507 
+                                       uint8_t *dest, int dstW, int dstY)
508 508 
 {
509 509 
     x86_reg dummy=0;
510 510 
     x86_reg dstW_reg = dstW;
... ... 
@@ -561,7 +561,7 @@ static inline void RENAME(yuv2rgb565_X_ar)(SwsContext *c, const int16_t *lumFilt
561 561 
                                            const int16_t *chrFilter, const int16_t **chrUSrc,
562 562 
                                            const int16_t **chrVSrc,
563 563 
                                            int chrFilterSize, const int16_t **alpSrc,
564 
-                                           uint8_t *dest, long dstW, long dstY)
564 
+                                           uint8_t *dest, int dstW, int dstY)
565 565 
 {
566 566 
     x86_reg dummy=0;
567 567 
     x86_reg dstW_reg = dstW;
... ... 
@@ -585,7 +585,7 @@ static inline void RENAME(yuv2rgb565_X)(SwsContext *c, const int16_t *lumFilter,
585 585 
                                         const int16_t *chrFilter, const int16_t **chrUSrc,
586 586 
                                         const int16_t **chrVSrc,
587 587 
                                         int chrFilterSize, const int16_t **alpSrc,
588 
-                                        uint8_t *dest, long dstW, long dstY)
588 
+                                        uint8_t *dest, int dstW, int dstY)
589 589 
 {
590 590 
     x86_reg dummy=0;
591 591 
     x86_reg dstW_reg = dstW;
... ... 
@@ -638,7 +638,7 @@ static inline void RENAME(yuv2rgb555_X_ar)(SwsContext *c, const int16_t *lumFilt
638 638 
                                            const int16_t *chrFilter, const int16_t **chrUSrc,
639 639 
                                            const int16_t **chrVSrc,
640 640 
                                            int chrFilterSize, const int16_t **alpSrc,
641 
-                                           uint8_t *dest, long dstW, long dstY)
641 
+                                           uint8_t *dest, int dstW, int dstY)
642 642 
 {
643 643 
     x86_reg dummy=0;
644 644 
     x86_reg dstW_reg = dstW;
... ... 
@@ -662,7 +662,7 @@ static inline void RENAME(yuv2rgb555_X)(SwsContext *c, const int16_t *lumFilter,
662 662 
                                         const int16_t *chrFilter, const int16_t **chrUSrc,
663 663 
                                         const int16_t **chrVSrc,
664 664 
                                         int chrFilterSize, const int16_t **alpSrc,
665 
-                                        uint8_t *dest, long dstW, long dstY)
665 
+                                        uint8_t *dest, int dstW, int dstY)
666 666 
 {
667 667 
     x86_reg dummy=0;
668 668 
     x86_reg dstW_reg = dstW;
... ... 
@@ -795,7 +795,7 @@ static inline void RENAME(yuv2bgr24_X_ar)(SwsContext *c, const int16_t *lumFilte
795 795 
                                           const int16_t *chrFilter, const int16_t **chrUSrc,
796 796 
                                           const int16_t **chrVSrc,
797 797 
                                           int chrFilterSize, const int16_t **alpSrc,
798 
-                                          uint8_t *dest, long dstW, long dstY)
798 
+                                          uint8_t *dest, int dstW, int dstY)
799 799 
 {
800 800 
     x86_reg dummy=0;
801 801 
     x86_reg dstW_reg = dstW;
... ... 
@@ -819,7 +819,7 @@ static inline void RENAME(yuv2bgr24_X)(SwsContext *c, const int16_t *lumFilter,
819 819 
                                        const int16_t *chrFilter, const int16_t **chrUSrc,
820 820 
                                        const int16_t **chrVSrc,
821 821 
                                        int chrFilterSize, const int16_t **alpSrc,
822 
-                                       uint8_t *dest, long dstW, long dstY)
822 
+                                       uint8_t *dest, int dstW, int dstY)
823 823 
 {
824 824 
     x86_reg dummy=0;
825 825 
     x86_reg dstW_reg = dstW;
... ... 
@@ -860,7 +860,7 @@ static inline void RENAME(yuv2yuyv422_X_ar)(SwsContext *c, const int16_t *lumFil
860 860 
                                             const int16_t *chrFilter, const int16_t **chrUSrc,
861 861 
                                             const int16_t **chrVSrc,
862 862 
                                             int chrFilterSize, const int16_t **alpSrc,
863 
-                                            uint8_t *dest, long dstW, long dstY)
863 
+                                            uint8_t *dest, int dstW, int dstY)
864 864 
 {
865 865 
     x86_reg dummy=0;
866 866 
     x86_reg dstW_reg = dstW;
... ... 
@@ -881,7 +881,7 @@ static inline void RENAME(yuv2yuyv422_X)(SwsContext *c, const int16_t *lumFilter
881 881 
                                          const int16_t *chrFilter, const int16_t **chrUSrc,
882 882 
                                          const int16_t **chrVSrc,
883 883 
                                          int chrFilterSize, const int16_t **alpSrc,
884 
-                                         uint8_t *dest, long dstW, long dstY)
884 
+                                         uint8_t *dest, int dstW, int dstY)
885 885 
 {
886 886 
     x86_reg dummy=0;
887 887 
     x86_reg dstW_reg = dstW;
... ... 
@@ -1578,7 +1578,7 @@ static inline void RENAME(yuv2yuyv422_1)(SwsContext *c, const uint16_t *buf0,
1578 1578 
 #if !COMPILE_TEMPLATE_MMX2
1579 1579 
 //FIXME yuy2* can read up to 7 samples too much
1580 1580
1581 
-static inline void RENAME(yuy2ToY)(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
1581 
+static inline void RENAME(yuy2ToY)(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)
1582 1582 
 {
1583 1583 
     __asm__ volatile(
1584 1584 
         "movq "MANGLE(bm01010101)", %%mm2           \n\t"
... ... 
@@ -1597,7 +1597,7 @@ static inline void RENAME(yuy2ToY)(uint8_t *dst, const uint8_t *src, long width,
1597 1597 
     );
1598 1598 
 }
1599 1599
1600 
-static inline void RENAME(yuy2ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
1600 
+static inline void RENAME(yuy2ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, int width, uint32_t *unused)
1601 1601 
 {
1602 1602 
     __asm__ volatile(
1603 1603 
         "movq "MANGLE(bm01010101)", %%mm4           \n\t"
... ... 
@@ -1623,7 +1623,7 @@ static inline void RENAME(yuy2ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t
1623 1623 
     assert(src1 == src2);
1624 1624 
 }
1625 1625
1626 
-static inline void RENAME(LEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
1626 
+static inline void RENAME(LEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, int width, uint32_t *unused)
1627 1627 
 {
1628 1628 
     __asm__ volatile(
1629 1629 
         "mov                    %0, %%"REG_a"       \n\t"
... ... 
@@ -1649,7 +1649,7 @@ static inline void RENAME(LEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *s
1649 1649
1650 1650 
 /* This is almost identical to the previous, end exists only because
1651 1651 
  * yuy2ToY/UV)(dst, src+1, ...) would have 100% unaligned accesses. */
1652 
-static inline void RENAME(uyvyToY)(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
1652 
+static inline void RENAME(uyvyToY)(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)
1653 1653 
 {
1654 1654 
     __asm__ volatile(
1655 1655 
         "mov                  %0, %%"REG_a"         \n\t"
... ... 
@@ -1667,7 +1667,7 @@ static inline void RENAME(uyvyToY)(uint8_t *dst, const uint8_t *src, long width,
1667 1667 
     );
1668 1668 
 }
1669 1669
1670 
-static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
1670 
+static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, int width, uint32_t *unused)
1671 1671 
 {
1672 1672 
     __asm__ volatile(
1673 1673 
         "movq "MANGLE(bm01010101)", %%mm4           \n\t"
... ... 
@@ -1693,7 +1693,7 @@ static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t
1693 1693 
     assert(src1 == src2);
1694 1694 
 }
1695 1695
1696 
-static inline void RENAME(BEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
1696 
+static inline void RENAME(BEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, int width, uint32_t *unused)
1697 1697 
 {
1698 1698 
     __asm__ volatile(
1699 1699 
         "movq "MANGLE(bm01010101)", %%mm4           \n\t"
... ... 
@@ -1719,7 +1719,7 @@ static inline void RENAME(BEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *s
1719 1719 
 }
1720 1720
1721 1721 
 static inline void RENAME(nvXXtoUV)(uint8_t *dst1, uint8_t *dst2,
1722 
-                                    const uint8_t *src, long width)
1722 
+                                    const uint8_t *src, int width)
1723 1723 
 {
1724 1724 
     __asm__ volatile(
1725 1725 
         "movq "MANGLE(bm01010101)", %%mm4           \n\t"
... ... 
@@ -1746,20 +1746,20 @@ static inline void RENAME(nvXXtoUV)(uint8_t *dst1, uint8_t *dst2,
1746 1746
1747 1747 
 static inline void RENAME(nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
1748 1748 
                                     const uint8_t *src1, const uint8_t *src2,
1749 
-                                    long width, uint32_t *unused)
1749 
+                                    int width, uint32_t *unused)
1750 1750 
 {
1751 1751 
     RENAME(nvXXtoUV)(dstU, dstV, src1, width);
1752 1752 
 }
1753 1753
1754 1754 
 static inline void RENAME(nv21ToUV)(uint8_t *dstU, uint8_t *dstV,
1755 1755 
                                     const uint8_t *src1, const uint8_t *src2,
1756 
-                                    long width, uint32_t *unused)
1756 
+                                    int width, uint32_t *unused)
1757 1757 
 {
1758 1758 
     RENAME(nvXXtoUV)(dstV, dstU, src1, width);
1759 1759 
 }
1760 1760 
 #endif /* !COMPILE_TEMPLATE_MMX2 */
1761 1761
1762 
-static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, const uint8_t *src, long width, enum PixelFormat srcFormat)
1762 
+static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, const uint8_t *src, int width, enum PixelFormat srcFormat)
1763 1763 
 {
1764 1764
1765 1765 
     if(srcFormat == PIX_FMT_BGR24) {
... ... 
@@ -1812,7 +1812,7 @@ static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, const uint8_t *src, long w
1812 1812 
     );
1813 1813 
 }
1814 1814
1815 
-static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, long width, enum PixelFormat srcFormat)
1815 
+static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, int width, enum PixelFormat srcFormat)
1816 1816 
 {
1817 1817 
     __asm__ volatile(
1818 1818 
         "movq                    24(%4), %%mm6       \n\t"
... ... 
@@ -1870,23 +1870,23 @@ static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, const uin
1870 1870 
     );
1871 1871 
 }
1872 1872
1873 
-static inline void RENAME(bgr24ToY)(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
1873 
+static inline void RENAME(bgr24ToY)(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)
1874 1874 
 {
1875 1875 
     RENAME(bgr24ToY_mmx)(dst, src, width, PIX_FMT_BGR24);
1876 1876 
 }
1877 1877
1878 
-static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
1878 
+static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, int width, uint32_t *unused)
1879 1879 
 {
1880 1880 
     RENAME(bgr24ToUV_mmx)(dstU, dstV, src1, width, PIX_FMT_BGR24);
1881 1881 
     assert(src1 == src2);
1882 1882 
 }
1883 1883
1884 
-static inline void RENAME(rgb24ToY)(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
1884 
+static inline void RENAME(rgb24ToY)(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused)
1885 1885 
 {
1886 1886 
     RENAME(bgr24ToY_mmx)(dst, src, width, PIX_FMT_RGB24);
1887 1887 
 }
1888 1888
1889 
-static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
1889 
+static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, int width, uint32_t *unused)
1890 1890 
 {
1891 1891 
     assert(src1==src2);
1892 1892 
     RENAME(bgr24ToUV_mmx)(dstU, dstV, src1, width, PIX_FMT_RGB24);
... ... 
@@ -1895,7 +1895,7 @@ static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t
1895 1895 
 #if !COMPILE_TEMPLATE_MMX2
1896 1896 
 // bilinear / bicubic scaling
1897 1897 
 static inline void RENAME(hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW, int xInc,
1898 
-                                  const int16_t *filter, const int16_t *filterPos, long filterSize)
1898 
+                                  const int16_t *filter, const int16_t *filterPos, int filterSize)
1899 1899 
 {
1900 1900 
     assert(filterSize % 4 == 0 && filterSize>0);
1901 1901 
     if (filterSize==4) { // Always true for upscaling, sometimes for down, too.
... ... 
@@ -2051,7 +2051,7 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, const uint8_t *src, in
2051 2051
2052 2052 
 #if COMPILE_TEMPLATE_MMX2
2053 2053 
 static inline void RENAME(hyscale_fast)(SwsContext *c, int16_t *dst,
2054 
-                                        long dstWidth, const uint8_t *src, int srcW,
2054 
+                                        int dstWidth, const uint8_t *src, int srcW,
2055 2055 
                                         int xInc)
2056 2056 
 {
2057 2057 
     int32_t *filterPos = c->hLumFilterPos;
... ... 
@@ -2123,7 +2123,7 @@ static inline void RENAME(hyscale_fast)(SwsContext *c, int16_t *dst,
2123 2123 
 }
2124 2124
2125 2125 
 static inline void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst1, int16_t *dst2,
2126 
-                                        long dstWidth, const uint8_t *src1,
2126 
+                                        int dstWidth, const uint8_t *src1,
2127 2127 
                                         const uint8_t *src2, int srcW, int xInc)
2128 2128 
 {
2129 2129 
     int32_t *filterPos = c->hChrFilterPos;