diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-12 21:53:22 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-06-14 09:46:49 -0400 |
| commit | 0af8a71d66305874bd6f0ebc84ebf99339b6a5d3 (patch) | |
| tree | 6807ebfdaa9996cac5a57c0f3075af41b283f1a7 /libswscale | |
| parent | cf53c48615658a6019ffb7e8453913bbfd38cb27 (diff) | |
| download | ffmpeg-0af8a71d66305874bd6f0ebc84ebf99339b6a5d3.tar.gz | |
swscale: fix JPEG-range YUV scaling artifacts.
YUV planes were marked as uint16_t, but they contained signed data.
Fixes issue 1108 and 675.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 10 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index ba89a0f4be..a09dba037e 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1701,7 +1701,7 @@ static void hScale_c(int16_t *dst, int dstW, const uint8_t *src, //FIXME all pal and rgb srcFormats could do this convertion as well //FIXME all scalers more complex than bilinear could do half of this transform -static void chrRangeToJpeg_c(uint16_t *dstU, uint16_t *dstV, int width) +static void chrRangeToJpeg_c(int16_t *dstU, int16_t *dstV, int width) { int i; for (i = 0; i < width; i++) { @@ -1709,7 +1709,7 @@ static void chrRangeToJpeg_c(uint16_t *dstU, uint16_t *dstV, int width) dstV[i] = (FFMIN(dstV[i],30775)*4663 - 9289992)>>12; //-264 } } -static void chrRangeFromJpeg_c(uint16_t *dstU, uint16_t *dstV, int width) +static void chrRangeFromJpeg_c(int16_t *dstU, int16_t *dstV, int width) { int i; for (i = 0; i < width; i++) { @@ -1717,13 +1717,13 @@ static void chrRangeFromJpeg_c(uint16_t *dstU, uint16_t *dstV, int width) dstV[i] = (dstV[i]*1799 + 4081085)>>11; //1469 } } -static void lumRangeToJpeg_c(uint16_t *dst, int width) +static void lumRangeToJpeg_c(int16_t *dst, int width) { int i; for (i = 0; i < width; i++) dst[i] = (FFMIN(dst[i],30189)*19077 - 39057361)>>14; } -static void lumRangeFromJpeg_c(uint16_t *dst, int width) +static void lumRangeFromJpeg_c(int16_t *dst, int width) { int i; for (i = 0; i < width; i++) @@ -1752,7 +1752,7 @@ static av_always_inline void hyscale(SwsContext *c, uint16_t *dst, int dstWidth, uint32_t *pal, int isAlpha) { void (*toYV12)(uint8_t *, const uint8_t *, int, uint32_t *) = isAlpha ? c->alpToYV12 : c->lumToYV12; - void (*convertRange)(uint16_t *, int) = isAlpha ? NULL : c->lumConvertRange; + void (*convertRange)(int16_t *, int) = isAlpha ? NULL : c->lumConvertRange; if (toYV12) { toYV12(formatConvBuffer, src, srcW, pal); diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 483842e866..ea34d8ce0e 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -310,8 +310,8 @@ typedef struct SwsContext { int xInc, const int16_t *filter, const int16_t *filterPos, int filterSize); - void (*lumConvertRange)(uint16_t *dst, int width); ///< Color range conversion function for luma plane if needed. - void (*chrConvertRange)(uint16_t *dst1, uint16_t *dst2, int width); ///< Color range conversion function for chroma planes if needed. + void (*lumConvertRange)(int16_t *dst, int width); ///< Color range conversion function for luma plane if needed. + void (*chrConvertRange)(int16_t *dst1, int16_t *dst2, int width); ///< Color range conversion function for chroma planes if needed. int needs_hcscale; ///< Set if there are chroma planes to be converted. |