diff options
Diffstat (limited to 'libswscale/swscale_template.c')
| -rw-r--r-- | libswscale/swscale_template.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 0f40f5b95e..98de521cb1 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -24,7 +24,7 @@ static inline void yuv2yuvX_c(SwsContext *c, const int16_t *lumFilter, const int16_t **chrVSrc, int chrFilterSize, const int16_t **alpSrc, uint8_t *dest, uint8_t *uDest, uint8_t *vDest, - uint8_t *aDest, long dstW, long chrDstW) + uint8_t *aDest, int dstW, int chrDstW) { yuv2yuvXinC(lumFilter, lumSrc, lumFilterSize, chrFilter, chrUSrc, chrVSrc, chrFilterSize, @@ -47,7 +47,7 @@ static inline void yuv2yuv1_c(SwsContext *c, const int16_t *lumSrc, const int16_t *chrUSrc, const int16_t *chrVSrc, const int16_t *alpSrc, uint8_t *dest, uint8_t *uDest, uint8_t *vDest, - uint8_t *aDest, long dstW, long chrDstW) + uint8_t *aDest, int dstW, int chrDstW) { int i; for (i=0; i<dstW; i++) { @@ -79,7 +79,7 @@ static inline void yuv2packedX_c(SwsContext *c, const int16_t *lumFilter, const int16_t *chrFilter, const int16_t **chrUSrc, const int16_t **chrVSrc, int chrFilterSize, const int16_t **alpSrc, - uint8_t *dest, long dstW, long dstY) + uint8_t *dest, int dstW, int dstY) { yuv2packedXinC(c, lumFilter, lumSrc, lumFilterSize, chrFilter, chrUSrc, chrVSrc, chrFilterSize, @@ -128,7 +128,7 @@ static inline void yuv2packed1_c(SwsContext *c, const uint16_t *buf0, //FIXME yuy2* can read up to 7 samples too much -static inline void yuy2ToY_c(uint8_t *dst, const uint8_t *src, long width, +static inline void yuy2ToY_c(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused) { int i; @@ -137,7 +137,7 @@ static inline void yuy2ToY_c(uint8_t *dst, const uint8_t *src, long width, } static inline void yuy2ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; 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, } static inline void LEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; // 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, /* This is almost identical to the previous, end exists only because * yuy2ToY/UV)(dst, src+1, ...) would have 100% unaligned accesses. */ -static inline void uyvyToY_c(uint8_t *dst, const uint8_t *src, long width, +static inline void uyvyToY_c(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused) { int i; @@ -170,7 +170,7 @@ static inline void uyvyToY_c(uint8_t *dst, const uint8_t *src, long width, } static inline void uyvyToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; 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, } static inline void BEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; 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, } static inline void nvXXtoUV_c(uint8_t *dst1, uint8_t *dst2, - const uint8_t *src, long width) + const uint8_t *src, int width) { int i; for (i = 0; i < width; i++) { @@ -205,7 +205,7 @@ static inline void nvXXtoUV_c(uint8_t *dst1, uint8_t *dst2, #define YUV_NBPS(depth, endianness, rfunc) \ static inline void endianness ## depth ## ToUV_c(uint8_t *dstU, uint8_t *dstV, \ const uint16_t *srcU, const uint16_t *srcV, \ - long width, uint32_t *unused) \ + int width, uint32_t *unused) \ { \ int i; \ for (i = 0; i < width; i++) { \ @@ -214,7 +214,7 @@ static inline void endianness ## depth ## ToUV_c(uint8_t *dstU, uint8_t *dstV, \ } \ } \ \ -static inline void endianness ## depth ## ToY_c(uint8_t *dstY, const uint16_t *srcY, long width, uint32_t *unused) \ +static inline void endianness ## depth ## ToY_c(uint8_t *dstY, const uint16_t *srcY, int width, uint32_t *unused) \ { \ int i; \ for (i = 0; i < width; i++) \ @@ -229,20 +229,20 @@ YUV_NBPS(10, BE, AV_RB16) static inline void nv12ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, - long width, uint32_t *unused) + int width, uint32_t *unused) { nvXXtoUV_c(dstU, dstV, src1, width); } static inline void nv21ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, - long width, uint32_t *unused) + int width, uint32_t *unused) { nvXXtoUV_c(dstV, dstU, src1, width); } static inline void bgr24ToY_c(int16_t *dst, const uint8_t *src, - long width, uint32_t *unused) + int width, uint32_t *unused) { int i; for (i=0; i<width; i++) { @@ -255,7 +255,7 @@ static inline void bgr24ToY_c(int16_t *dst, const uint8_t *src, } static inline void bgr24ToUV_c(int16_t *dstU, int16_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; for (i=0; i<width; i++) { @@ -270,7 +270,7 @@ static inline void bgr24ToUV_c(int16_t *dstU, int16_t *dstV, const uint8_t *src1 } static inline void bgr24ToUV_half_c(int16_t *dstU, int16_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; for (i=0; i<width; i++) { @@ -284,7 +284,7 @@ static inline void bgr24ToUV_half_c(int16_t *dstU, int16_t *dstV, const uint8_t assert(src1 == src2); } -static inline void rgb24ToY_c(int16_t *dst, const uint8_t *src, long width, +static inline void rgb24ToY_c(int16_t *dst, const uint8_t *src, int width, uint32_t *unused) { int i; @@ -298,7 +298,7 @@ static inline void rgb24ToY_c(int16_t *dst, const uint8_t *src, long width, } static inline void rgb24ToUV_c(int16_t *dstU, int16_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; assert(src1==src2); @@ -313,7 +313,7 @@ static inline void rgb24ToUV_c(int16_t *dstU, int16_t *dstV, const uint8_t *src1 } static inline void rgb24ToUV_half_c(int16_t *dstU, int16_t *dstV, const uint8_t *src1, - const uint8_t *src2, long width, uint32_t *unused) + const uint8_t *src2, int width, uint32_t *unused) { int i; assert(src1==src2); @@ -332,7 +332,7 @@ static inline void rgb24ToUV_half_c(int16_t *dstU, int16_t *dstV, const uint8_t static inline void hScale_c(int16_t *dst, int dstW, const uint8_t *src, int srcW, int xInc, const int16_t *filter, const int16_t *filterPos, - long filterSize) + int filterSize) { int i; for (i=0; i<dstW; i++) { @@ -408,7 +408,7 @@ static void lumRangeFromJpeg_c(int16_t *dst, int width) dst[i] = (dst[i]*14071 + 33561947)>>14; } -static inline void hyscale_fast_c(SwsContext *c, int16_t *dst, long dstWidth, +static inline void hyscale_fast_c(SwsContext *c, int16_t *dst, int dstWidth, const uint8_t *src, int srcW, int xInc) { int i; @@ -422,14 +422,14 @@ static inline void hyscale_fast_c(SwsContext *c, int16_t *dst, long dstWidth, } // *** horizontal scale Y line to temp buffer -static inline void hyscale_c(SwsContext *c, uint16_t *dst, long dstWidth, +static inline void hyscale_c(SwsContext *c, uint16_t *dst, int dstWidth, const uint8_t *src, int srcW, int xInc, const int16_t *hLumFilter, const int16_t *hLumFilterPos, int hLumFilterSize, uint8_t *formatConvBuffer, uint32_t *pal, int isAlpha) { - void (*toYV12)(uint8_t *, const uint8_t *, long, uint32_t *) = isAlpha ? c->alpToYV12 : c->lumToYV12; + void (*toYV12)(uint8_t *, const uint8_t *, int, uint32_t *) = isAlpha ? c->alpToYV12 : c->lumToYV12; void (*convertRange)(int16_t *, int) = isAlpha ? NULL : c->lumConvertRange; src += isAlpha ? c->alpSrcOffset : c->lumSrcOffset; @@ -453,7 +453,7 @@ static inline void hyscale_c(SwsContext *c, uint16_t *dst, long dstWidth, } static inline void hcscale_fast_c(SwsContext *c, int16_t *dst1, int16_t *dst2, - long dstWidth, const uint8_t *src1, + int dstWidth, const uint8_t *src1, const uint8_t *src2, int srcW, int xInc) { int i; @@ -467,7 +467,7 @@ static inline void hcscale_fast_c(SwsContext *c, int16_t *dst1, int16_t *dst2, } } -inline static void hcscale_c(SwsContext *c, uint16_t *dst1, uint16_t *dst2, long dstWidth, +inline static void hcscale_c(SwsContext *c, uint16_t *dst1, uint16_t *dst2, int dstWidth, const uint8_t *src1, const uint8_t *src2, int srcW, int xInc, const int16_t *hChrFilter, const int16_t *hChrFilterPos, int hChrFilterSize, |