Skip to content

F
Ffmpeg

小白菜888 / Ffmpeg

通知 3
Star 0
Fork 0
F
Ffmpeg

体验新版 GitCode，发现更多精彩内容 >>

提交 c0c32a37 编写于 作者: M Michael Niedermayer
浏览文件
操作

swscale: Fix rounding in yuv2rgb_1_c_template() 

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
上级 2bc610dd
隐藏空白更改
内联 并排
Showing with 12 addition and 12 deletion
libswscale/output.c
浏览文件 @ c0c32a37
...@@ -994,18 +994,18 @@ yuv2rgb_1_c_template(SwsContext *c, const int16_t *buf0, ...@@ -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, ...@@ -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,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或