Mercurial > mplayer.hg
comparison libswscale/swscale_internal.h @ 31096:0a999f052474
Use int instead of long to pass width parameters in non-public functions.
long was being incorrectly used as an x86-sized register, both for 32 and 64
bits, but this is not the case in win64.
| author | ramiro |
|---|---|
| date | Tue, 11 May 2010 00:36:34 +0000 |
| parents | 9257c04720ed |
| children | 1f7d0e9e2ebf |
comparison
equal
deleted
inserted
replaced
| 31095:7a2ec1d564ce | 31096:0a999f052474 |
|---|---|
| 258 int dstW, int chrDstW, int dstFormat); | 258 int dstW, int chrDstW, int dstFormat); |
| 259 void (*yuv2yuv1 )(struct SwsContext *c, | 259 void (*yuv2yuv1 )(struct SwsContext *c, |
| 260 const int16_t *lumSrc, const int16_t *chrSrc, const int16_t *alpSrc, | 260 const int16_t *lumSrc, const int16_t *chrSrc, const int16_t *alpSrc, |
| 261 uint8_t *dest, | 261 uint8_t *dest, |
| 262 uint8_t *uDest, uint8_t *vDest, uint8_t *aDest, | 262 uint8_t *uDest, uint8_t *vDest, uint8_t *aDest, |
| 263 long dstW, long chrDstW); | 263 int dstW, int chrDstW); |
| 264 void (*yuv2yuvX )(struct SwsContext *c, | 264 void (*yuv2yuvX )(struct SwsContext *c, |
| 265 const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, | 265 const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, |
| 266 const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, | 266 const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, |
| 267 const int16_t **alpSrc, | 267 const int16_t **alpSrc, |
| 268 uint8_t *dest, | 268 uint8_t *dest, |
| 269 uint8_t *uDest, uint8_t *vDest, uint8_t *aDest, | 269 uint8_t *uDest, uint8_t *vDest, uint8_t *aDest, |
| 270 long dstW, long chrDstW); | 270 int dstW, int chrDstW); |
| 271 void (*yuv2packed1)(struct SwsContext *c, | 271 void (*yuv2packed1)(struct SwsContext *c, |
| 272 const uint16_t *buf0, | 272 const uint16_t *buf0, |
| 273 const uint16_t *uvbuf0, const uint16_t *uvbuf1, | 273 const uint16_t *uvbuf0, const uint16_t *uvbuf1, |
| 274 const uint16_t *abuf0, | 274 const uint16_t *abuf0, |
| 275 uint8_t *dest, | 275 uint8_t *dest, |
| 282 int dstW, int yalpha, int uvalpha, int y); | 282 int dstW, int yalpha, int uvalpha, int y); |
| 283 void (*yuv2packedX)(struct SwsContext *c, | 283 void (*yuv2packedX)(struct SwsContext *c, |
| 284 const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, | 284 const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, |
| 285 const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, | 285 const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, |
| 286 const int16_t **alpSrc, uint8_t *dest, | 286 const int16_t **alpSrc, uint8_t *dest, |
| 287 long dstW, long dstY); | 287 int dstW, int dstY); |
| 288 | 288 |
| 289 void (*lumToYV12)(uint8_t *dst, const uint8_t *src, | 289 void (*lumToYV12)(uint8_t *dst, const uint8_t *src, |
| 290 long width, uint32_t *pal); ///< Unscaled conversion of luma plane to YV12 for horizontal scaler. | 290 int width, uint32_t *pal); ///< Unscaled conversion of luma plane to YV12 for horizontal scaler. |
| 291 void (*alpToYV12)(uint8_t *dst, const uint8_t *src, | 291 void (*alpToYV12)(uint8_t *dst, const uint8_t *src, |
| 292 long width, uint32_t *pal); ///< Unscaled conversion of alpha plane to YV12 for horizontal scaler. | 292 int width, uint32_t *pal); ///< Unscaled conversion of alpha plane to YV12 for horizontal scaler. |
| 293 void (*chrToYV12)(uint8_t *dstU, uint8_t *dstV, | 293 void (*chrToYV12)(uint8_t *dstU, uint8_t *dstV, |
| 294 const uint8_t *src1, const uint8_t *src2, | 294 const uint8_t *src1, const uint8_t *src2, |
| 295 long width, uint32_t *pal); ///< Unscaled conversion of chroma planes to YV12 for horizontal scaler. | 295 int width, uint32_t *pal); ///< Unscaled conversion of chroma planes to YV12 for horizontal scaler. |
| 296 void (*hyscale_fast)(struct SwsContext *c, | 296 void (*hyscale_fast)(struct SwsContext *c, |
| 297 int16_t *dst, long dstWidth, | 297 int16_t *dst, int dstWidth, |
| 298 const uint8_t *src, int srcW, int xInc); | 298 const uint8_t *src, int srcW, int xInc); |
| 299 void (*hcscale_fast)(struct SwsContext *c, | 299 void (*hcscale_fast)(struct SwsContext *c, |
| 300 int16_t *dst, long dstWidth, | 300 int16_t *dst, int dstWidth, |
| 301 const uint8_t *src1, const uint8_t *src2, | 301 const uint8_t *src1, const uint8_t *src2, |
| 302 int srcW, int xInc); | 302 int srcW, int xInc); |
| 303 | 303 |
| 304 void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW, | 304 void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW, |
| 305 int xInc, const int16_t *filter, const int16_t *filterPos, | 305 int xInc, const int16_t *filter, const int16_t *filterPos, |
| 306 long filterSize); | 306 int filterSize); |
| 307 | 307 |
| 308 void (*lumConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for luma plane if needed. | 308 void (*lumConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for luma plane if needed. |
| 309 void (*chrConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for chroma planes if needed. | 309 void (*chrConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for chroma planes if needed. |
| 310 | 310 |
| 311 int lumSrcOffset; ///< Offset given to luma src pointers passed to horizontal input functions. | 311 int lumSrcOffset; ///< Offset given to luma src pointers passed to horizontal input functions. |