Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| ... | ... |
@@ -387,10 +387,10 @@ static int config_input(AVFilterLink *inlink) |
| 387 | 387 |
luma_pos = ((x) ) + ((y) ) * picref->linesize[0]; \ |
| 388 | 388 |
chroma_pos1 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[1]; \ |
| 389 | 389 |
chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[2]; \ |
| 390 |
- alpha = (yuva_color[3] * (val)) / 255; \ |
|
| 391 |
- picref->data[0][luma_pos] = (alpha * yuva_color[0] + (255 - alpha) * picref->data[0][luma_pos]) >> 8; \ |
|
| 392 |
- picref->data[1][chroma_pos1] = (alpha * yuva_color[1] + (255 - alpha) * picref->data[1][chroma_pos1]) >> 8; \ |
|
| 393 |
- picref->data[2][chroma_pos2] = (alpha * yuva_color[2] + (255 - alpha) * picref->data[2][chroma_pos2]) >> 8; \ |
|
| 390 |
+ alpha = yuva_color[3] * (val) * 129; \ |
|
| 391 |
+ picref->data[0][luma_pos] = (alpha * yuva_color[0] + (255*255*129 - alpha) * picref->data[0][luma_pos] ) >> 23; \ |
|
| 392 |
+ picref->data[1][chroma_pos1] = (alpha * yuva_color[1] + (255*255*129 - alpha) * picref->data[1][chroma_pos1]) >> 23; \ |
|
| 393 |
+ picref->data[2][chroma_pos2] = (alpha * yuva_color[2] + (255*255*129 - alpha) * picref->data[2][chroma_pos2]) >> 23; \ |
|
| 394 | 394 |
} |
| 395 | 395 |
|
| 396 | 396 |
static inline int draw_glyph_yuv(AVFilterBufferRef *picref, FT_Bitmap *bitmap, unsigned int x, |
| ... | ... |
@@ -422,10 +422,10 @@ static inline int draw_glyph_yuv(AVFilterBufferRef *picref, FT_Bitmap *bitmap, u |
| 422 | 422 |
|
| 423 | 423 |
#define SET_PIXEL_RGB(picref, rgba_color, val, x, y, pixel_step, r_off, g_off, b_off, a_off) { \
|
| 424 | 424 |
p = picref->data[0] + (x) * pixel_step + ((y) * picref->linesize[0]); \ |
| 425 |
- alpha = (rgba_color[3] * (val)) / 255; \ |
|
| 426 |
- *(p+r_off) = (alpha * rgba_color[0] + (255 - alpha) * *(p+r_off)) >> 8; \ |
|
| 427 |
- *(p+g_off) = (alpha * rgba_color[1] + (255 - alpha) * *(p+g_off)) >> 8; \ |
|
| 428 |
- *(p+b_off) = (alpha * rgba_color[2] + (255 - alpha) * *(p+b_off)) >> 8; \ |
|
| 425 |
+ alpha = rgba_color[3] * (val) * 129; \ |
|
| 426 |
+ *(p+r_off) = (alpha * rgba_color[0] + (255*255*129 - alpha) * *(p+r_off)) >> 23; \ |
|
| 427 |
+ *(p+g_off) = (alpha * rgba_color[1] + (255*255*129 - alpha) * *(p+g_off)) >> 23; \ |
|
| 428 |
+ *(p+b_off) = (alpha * rgba_color[2] + (255*255*129 - alpha) * *(p+b_off)) >> 23; \ |
|
| 429 | 429 |
} |
| 430 | 430 |
|
| 431 | 431 |
static inline int draw_glyph_rgb(AVFilterBufferRef *picref, FT_Bitmap *bitmap, |