From: Michael Niedermayer Date: Mon, 21 Feb 2011 23:23:31 +0000 (+0100) Subject: drawtext: simplify chroma blend and fix chroma alpha. X-Git-Tag: v0.7b2~105 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e74bf3f3684ab92f0a7ceac3fb23ed6c400beb9a;p=platform%2Fupstream%2Flibav.git drawtext: simplify chroma blend and fix chroma alpha. Signed-off-by: Anton Khirnov --- diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 21ec176..9fb3cea 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,