diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-13 16:45:04 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-13 16:45:28 -0400 |
| commit | c3d68ec9c5fc8b86de2bf3757d353e6ff4ce0815 (patch) | |
| tree | 5c9375b79c9033fadf06b9721285759be72d0320 | |
| parent | 1550f45a8928f31c48f770b5ddf860c99a57687e (diff) | |
| download | ffmpeg-c3d68ec9c5fc8b86de2bf3757d353e6ff4ce0815.tar.gz | |
swscale: fix clipping of 9/10bit YUV420P.
| -rw-r--r-- | libswscale/swscale.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index b63a3868c5..4394a7d9ea 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -218,6 +218,20 @@ static av_always_inline void yuv2yuvX16inC_template(const int16_t *lumFilter, co int i; int shift = 11 + 16 - output_bits; +#define output_pixel(pos, val) \ + if (big_endian) { \ + if (output_bits == 16) { \ + AV_WB16(pos, av_clip_uint16(val >> shift)); \ + } else { \ + AV_WB16(pos, av_clip_uintp2(val >> shift, output_bits)); \ + } \ + } else { \ + if (output_bits == 16) { \ + AV_WL16(pos, av_clip_uint16(val >> shift)); \ + } else { \ + AV_WL16(pos, av_clip_uintp2(val >> shift, output_bits)); \ + } \ + } for (i = 0; i < dstW; i++) { int val = 1 << 10; int j; @@ -225,11 +239,7 @@ static av_always_inline void yuv2yuvX16inC_template(const int16_t *lumFilter, co for (j = 0; j < lumFilterSize; j++) val += lumSrc[j][i] * lumFilter[j]; - if (big_endian) { - AV_WB16(&dest[i], av_clip_uint16(val >> shift)); - } else { - AV_WL16(&dest[i], av_clip_uint16(val >> shift)); - } + output_pixel(&dest[i], val); } if (uDest) { @@ -243,13 +253,8 @@ static av_always_inline void yuv2yuvX16inC_template(const int16_t *lumFilter, co v += chrSrc[j][i + VOFW] * chrFilter[j]; } - if (big_endian) { - AV_WB16(&uDest[i], av_clip_uint16(u >> shift)); - AV_WB16(&vDest[i], av_clip_uint16(v >> shift)); - } else { - AV_WL16(&uDest[i], av_clip_uint16(u >> shift)); - AV_WL16(&vDest[i], av_clip_uint16(v >> shift)); - } + output_pixel(&uDest[i], u); + output_pixel(&vDest[i], v); } } @@ -261,11 +266,7 @@ static av_always_inline void yuv2yuvX16inC_template(const int16_t *lumFilter, co for (j = 0; j < lumFilterSize; j++) val += alpSrc[j][i] * lumFilter[j]; - if (big_endian) { - AV_WB16(&aDest[i], av_clip_uint16(val >> shift)); - } else { - AV_WL16(&aDest[i], av_clip_uint16(val >> shift)); - } + output_pixel(&aDest[i], val); } } } |