Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

swscale: Fix rounding in yuv2rgb_1_c_template()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/3/merge
Michael Niedermayer 13 years ago
parent 2bc610ddc5
commit c0c32a3704
1 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      libswscale/output.c

24
libswscale/output.c
Unescape View File

@ -994,18 +994,18 @@ yuv2rgb_1_c_template(SwsContext *c, const int16_t *buf0,
if (uvalpha < 2048) { if (uvalpha < 2048) {
for (i = 0; i < (dstW >> 1); i++) { for (i = 0; i < (dstW >> 1); i++) {
int Y1 = buf0[i * 2] >> 7; int Y1 = (buf0[i * 2 ] + 64) >> 7;
int Y2 = buf0[i * 2 + 1] >> 7; int Y2 = (buf0[i * 2 + 1] + 64) >> 7;
int U = ubuf0[i] >> 7; int U = (ubuf0[i] + 64) >> 7;
int V = vbuf0[i] >> 7; int V = (vbuf0[i] + 64) >> 7;
int A1, A2; int A1, A2;
const void *r = c->table_rV[V + YUVRGB_TABLE_HEADROOM], const void *r = c->table_rV[V + YUVRGB_TABLE_HEADROOM],
*g = (c->table_gU[U + YUVRGB_TABLE_HEADROOM] + c->table_gV[V + YUVRGB_TABLE_HEADROOM]), *g = (c->table_gU[U + YUVRGB_TABLE_HEADROOM] + c->table_gV[V + YUVRGB_TABLE_HEADROOM]),
*b = c->table_bU[U + YUVRGB_TABLE_HEADROOM]; *b = c->table_bU[U + YUVRGB_TABLE_HEADROOM];
if (hasAlpha) { if (hasAlpha) {
A1 = abuf0[i * 2 ] >> 7; A1 = (abuf0[i * 2 ] + 64) >> 7;
A2 = abuf0[i * 2 + 1] >> 7; A2 = (abuf0[i * 2 + 1] + 64) >> 7;
} }
yuv2rgb_write(dest, i, Y1, Y2, hasAlpha ? A1 : 0, hasAlpha ? A2 : 0, yuv2rgb_write(dest, i, Y1, Y2, hasAlpha ? A1 : 0, hasAlpha ? A2 : 0,
@ -1014,18 +1014,18 @@ yuv2rgb_1_c_template(SwsContext *c, const int16_t *buf0,
} else { } else {
const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1]; const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1];
for (i = 0; i < (dstW >> 1); i++) { for (i = 0; i < (dstW >> 1); i++) {
int Y1 = buf0[i * 2] >> 7; int Y1 = (buf0[i * 2 ] + 64) >> 7;
int Y2 = buf0[i * 2 + 1] >> 7; int Y2 = (buf0[i * 2 + 1] + 64) >> 7;
int U = (ubuf0[i] + ubuf1[i]) >> 8; int U = (ubuf0[i] + ubuf1[i] + 128) >> 8;
int V = (vbuf0[i] + vbuf1[i]) >> 8; int V = (vbuf0[i] + vbuf1[i] + 128) >> 8;
int A1, A2; int A1, A2;
const void *r = c->table_rV[V + YUVRGB_TABLE_HEADROOM], const void *r = c->table_rV[V + YUVRGB_TABLE_HEADROOM],
*g = (c->table_gU[U + YUVRGB_TABLE_HEADROOM] + c->table_gV[V + YUVRGB_TABLE_HEADROOM]), *g = (c->table_gU[U + YUVRGB_TABLE_HEADROOM] + c->table_gV[V + YUVRGB_TABLE_HEADROOM]),
*b = c->table_bU[U + YUVRGB_TABLE_HEADROOM]; *b = c->table_bU[U + YUVRGB_TABLE_HEADROOM];
if (hasAlpha) { if (hasAlpha) {
A1 = abuf0[i * 2 ] >> 7; A1 = (abuf0[i * 2 ] + 64) >> 7;
A2 = abuf0[i * 2 + 1] >> 7; A2 = (abuf0[i * 2 + 1] + 64) >> 7;
} }
yuv2rgb_write(dest, i, Y1, Y2, hasAlpha ? A1 : 0, hasAlpha ? A2 : 0, yuv2rgb_write(dest, i, Y1, Y2, hasAlpha ? A1 : 0, hasAlpha ? A2 : 0,

Write Preview
Loading…
Cancel
Save