diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 00:23:31 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-05-07 10:18:16 +0200 |
| commit | e74bf3f3684ab92f0a7ceac3fb23ed6c400beb9a (patch) | |
| tree | 96b790fdf706abbe5001cd5087070984fbf343eb /libavfilter | |
| parent | a5b64584f3ee1ffff5280b5be8425591725f844a (diff) | |
drawtext: simplify chroma blend and fix chroma alpha.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_drawtext.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 21ec176103..9fb3cea226 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -389,9 +389,8 @@ static int config_input(AVFilterLink *inlink) chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[2]; \ alpha = (yuva_color[3] * (val)) / 255; \ picref->data[0][luma_pos] = (alpha * yuva_color[0] + (255 - alpha) * picref->data[0][luma_pos]) >> 8; \ - alpha = (yuva_color[3] * (val)) / 224; \ - picref->data[1][chroma_pos1] = 16 + (alpha * (yuva_color[1]-16) + (224 - alpha) * (picref->data[1][chroma_pos1]-16)) / 224; \ - picref->data[2][chroma_pos2] = 16 + (alpha * (yuva_color[2]-16) + (224 - alpha) * (picref->data[2][chroma_pos2]-16)) / 224; \ + picref->data[1][chroma_pos1] = (alpha * yuva_color[1] + (255 - alpha) * picref->data[1][chroma_pos1]) >> 8; \ + picref->data[2][chroma_pos2] = (alpha * yuva_color[2] + (255 - alpha) * picref->data[2][chroma_pos2]) >> 8; \ } static inline int draw_glyph_yuv(AVFilterBufferRef *picref, FT_Bitmap *bitmap, unsigned int x, |