Skip to content

F
ffmpeg.wasm-core
Commit e74bf3f3 authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Anton Khirnov
Browse files
Options

drawtext: simplify chroma blend and fix chroma alpha. 

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent a5b64584
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
libavfilter/vf_drawtext.c
View file @ e74bf3f3
...@@ -389,9 +389,8 @@ static int config_input(AVFilterLink *inlink) ...@@ -389,9 +389,8 @@ static int config_input(AVFilterLink *inlink)
chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[2]; \ chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[2]; \
alpha = (yuva_color[3] * (val)) / 255; \ alpha = (yuva_color[3] * (val)) / 255; \
picref->data[0][luma_pos] = (alpha * yuva_color[0] + (255 - alpha) * picref->data[0][luma_pos]) >> 8; \ 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] = (alpha * yuva_color[1] + (255 - alpha) * picref->data[1][chroma_pos1]) >> 8; \
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] = (alpha * yuva_color[2] + (255 - alpha) * picref->data[2][chroma_pos2]) >> 8; \
picref->data[2][chroma_pos2] = 16 + (alpha * (yuva_color[2]-16) + (224 - alpha) * (picref->data[2][chroma_pos2]-16)) / 224; \
} }
static inline int draw_glyph_yuv(AVFilterBufferRef *picref, FT_Bitmap *bitmap, unsigned int x, static inline int draw_glyph_yuv(AVFilterBufferRef *picref, FT_Bitmap *bitmap, unsigned int x,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment