[FFmpeg-cvslog] swscale: fix clipping of 9/10bit YUV420P.
Ronald S. Bultje
git at videolan.org
Sat May 14 02:29:49 CEST 2011
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri May 13 16:45:04 2011 -0400| [c3d68ec9c5fc8b86de2bf3757d353e6ff4ce0815] | committer: Ronald S. Bultje
swscale: fix clipping of 9/10bit YUV420P.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3d68ec9c5fc8b86de2bf3757d353e6ff4ce0815
---
libswscale/swscale.c | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index b63a386..4394a7d 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);
}
}
}
More information about the ffmpeg-cvslog
mailing list