diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 00:54:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 01:49:54 +0100 |
| commit | bccea08836ad3e92b43a9770e5156e569103226a (patch) | |
| tree | 8e9cd2ccb76d4913b633e3d2dfffc5f28f8cd3f8 | |
| parent | 7d27902263af28c6c4875f1f815988d812e4b122 (diff) | |
| download | ffmpeg-bccea08836ad3e92b43a9770e5156e569103226a.tar.gz | |
Fix and optimize yuv blend in the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_drawtext.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 08ed818256..95ee5e8bd0 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -371,12 +371,14 @@ static int config_input(AVFilterLink *inlink) #define SET_PIXEL_YUV(picref, yuva_color, val, x, y, hsub, vsub) { \ luma_pos = ((x) ) + ((y) ) * picref->linesize[0]; \ - chroma_pos1 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[1]; \ - chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[2]; \ alpha = yuva_color[3] * (val) * 129; \ picref->data[0][luma_pos] = (alpha * yuva_color[0] + (255*255*129 - alpha) * picref->data[0][luma_pos] ) >> 23; \ - picref->data[1][chroma_pos1] = (alpha * yuva_color[1] + (255*255*129 - alpha) * picref->data[1][chroma_pos1]) >> 23; \ - picref->data[2][chroma_pos2] = (alpha * yuva_color[2] + (255*255*129 - alpha) * picref->data[2][chroma_pos2]) >> 23; \ + if(((x) & ((1<<(hsub))-1))==0 && ((y) & ((1<<(vsub))-1))==0){\ + chroma_pos1 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[1]; \ + chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[2]; \ + picref->data[1][chroma_pos1] = (alpha * yuva_color[1] + (255*255*129 - alpha) * picref->data[1][chroma_pos1]) >> 23; \ + picref->data[2][chroma_pos2] = (alpha * yuva_color[2] + (255*255*129 - alpha) * picref->data[2][chroma_pos2]) >> 23; \ + }\ } static inline int draw_glyph_yuv(AVFilterBufferRef *picref, FT_Bitmap *bitmap, unsigned int x, |