virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vf_drawtext: support W/H parameters to reduce UI differences to qatar

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-04 15:29:26 +01:00
parent 594090c6c2
commit dda3d716d6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/vf_drawtext.c
View File

@ -47,8 +47,8 @@
#include FT_GLYPH_H #include FT_GLYPH_H
static const char * const var_names[] = { static const char * const var_names[] = {
"main_w", "w", ///< width of the input video "main_w", "w", "W", ///< width of the input video
"main_h", "h", ///< height of the input video "main_h", "h", "H", ///< height of the input video
"tw", "text_w", ///< width of the rendered text "tw", "text_w", ///< width of the rendered text
"th", "text_h", ///< height of the rendered text "th", "text_h", ///< height of the rendered text
"max_glyph_w", ///< max glyph width "max_glyph_w", ///< max glyph width
@ -68,8 +68,8 @@ static const char * const var_names[] = {
}; };
enum var_name { enum var_name {
VAR_MAIN_W, VAR_W, VAR_MAIN_W, VAR_w, VAR_W,
VAR_MAIN_H, VAR_H, VAR_MAIN_H, VAR_h, VAR_H,
VAR_TW, VAR_TEXT_W, VAR_TW, VAR_TEXT_W,
VAR_TH, VAR_TEXT_H, VAR_TH, VAR_TEXT_H,
VAR_MAX_GLYPH_W, VAR_MAX_GLYPH_W,
@ -458,8 +458,8 @@ static int config_input(AVFilterLink *inlink)
dtext->shadowcolor[3] = rgba[3]; dtext->shadowcolor[3] = rgba[3];
} }
dtext->var_values[VAR_W] = dtext->var_values[VAR_MAIN_W] = inlink->w; dtext->var_values[VAR_w] = dtext->var_values[VAR_W] = dtext->var_values[VAR_MAIN_W] = inlink->w;
dtext->var_values[VAR_H] = dtext->var_values[VAR_MAIN_H] = inlink->h; dtext->var_values[VAR_h] = dtext->var_values[VAR_H] = dtext->var_values[VAR_MAIN_H] = inlink->h;
dtext->var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? av_q2d(inlink->sample_aspect_ratio) : 1; dtext->var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? av_q2d(inlink->sample_aspect_ratio) : 1;
dtext->var_values[VAR_DAR] = (double)inlink->w / inlink->h * dtext->var_values[VAR_SAR]; dtext->var_values[VAR_DAR] = (double)inlink->w / inlink->h * dtext->var_values[VAR_SAR];
dtext->var_values[VAR_HSUB] = 1<<pix_desc->log2_chroma_w; dtext->var_values[VAR_HSUB] = 1<<pix_desc->log2_chroma_w;