---
libavfilter/vf_drawtext.c | 92 +++++++++++++++++++++++------------------------
1 file changed, 46 insertions(+), 46 deletions(-)
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 62993cf..2df1a15 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/**
+/*
* @file
* drawtext filter, based on the original vhook/drawtext.c
* filter by Gustavo Sverzut Barbieri
@@ -64,14 +64,14 @@ static const char *const var_names[] = {
"E",
"PHI",
"PI",
- "main_w", "W", ///< width of the main video
- "main_h", "H", ///< height of the main video
- "text_w", "w", ///< width of the overlay text
- "text_h", "h", ///< height of the overlay text
+ "main_w", "W", // width of the main video
+ "main_h", "H", // height of the main video
+ "text_w", "w", // width of the overlay text
+ "text_h", "h", // height of the overlay text
"x",
"y",
- "n", ///< number of processed frames
- "t", ///< timestamp expressed in seconds
+ "n", // number of processed frames
+ "t", // timestamp expressed in seconds
NULL
};
@@ -109,53 +109,53 @@ enum var_name {
typedef struct DrawTextContext {
const AVClass *class;
#if CONFIG_LIBFONTCONFIG
- uint8_t *font; ///< font to be used
+ uint8_t *font; // font to be used
#endif
- uint8_t *fontfile; ///< font to be used
- uint8_t *text; ///< text to be drawn
- uint8_t *expanded_text; ///< used to contain the
strftime()-expanded text
- size_t expanded_text_size; ///< size in bytes of the expanded_text
buffer
- int ft_load_flags; ///< flags used for loading fonts, see
FT_LOAD_*
- FT_Vector *positions; ///< positions for each element in the text
- size_t nb_positions; ///< number of elements of positions array
- char *textfile; ///< file with text to be drawn
- int x, y; ///< position to start drawing text
- int w, h; ///< dimension of the text block
+ uint8_t *fontfile; // font to be used
+ uint8_t *text; // text to be drawn
+ uint8_t *expanded_text; // used to contain the strftime()-expanded
text
+ size_t expanded_text_size; // size in bytes of the expanded_text
buffer
+ int ft_load_flags; // flags used for loading fonts, see
FT_LOAD_*
+ FT_Vector *positions; // positions for each element in the text
+ size_t nb_positions; // number of elements of positions array
+ char *textfile; // file with text to be drawn
+ int x, y; // position to start drawing text
+ int w, h; // dimension of the text block
int shadowx, shadowy;
- unsigned int fontsize; ///< font size to use
- char *fontcolor_string; ///< font color as string
- char *boxcolor_string; ///< box color as string
- char *shadowcolor_string; ///< shadow color as string
- uint8_t fontcolor[4]; ///< foreground color
- uint8_t boxcolor[4]; ///< background color
- uint8_t shadowcolor[4]; ///< shadow color
- uint8_t fontcolor_rgba[4]; ///< foreground color in RGBA
- uint8_t boxcolor_rgba[4]; ///< background color in RGBA
- uint8_t shadowcolor_rgba[4]; ///< shadow color in RGBA
-
- short int draw_box; ///< draw box around text - true or false
- int use_kerning; ///< font kerning is used - true/false
- int tabsize; ///< tab size
- int fix_bounds; ///< do we let it go out of frame bounds -
t/f
-
- FT_Library library; ///< freetype font library handle
- FT_Face face; ///< freetype font face handle
- struct AVTreeNode *glyphs; ///< rendered glyphs, stored using the
UTF-32 char code
- int hsub, vsub; ///< chroma subsampling values
+ unsigned int fontsize; // font size to use
+ char *fontcolor_string; // font color as string
+ char *boxcolor_string; // box color as string
+ char *shadowcolor_string; // shadow color as string
+ uint8_t fontcolor[4]; // foreground color
+ uint8_t boxcolor[4]; // background color
+ uint8_t shadowcolor[4]; // shadow color
+ uint8_t fontcolor_rgba[4]; // foreground color in RGBA
+ uint8_t boxcolor_rgba[4]; // background color in RGBA
+ uint8_t shadowcolor_rgba[4]; // shadow color in RGBA
+
+ short int draw_box; // draw box around text - true or false
+ int use_kerning; // font kerning is used - true/false
+ int tabsize; // tab size
+ int fix_bounds; // do we let it go out of frame bounds -
t/f
+
+ FT_Library library; // freetype font library handle
+ FT_Face face; // freetype font face handle
+ struct AVTreeNode *glyphs; // rendered glyphs, stored using the
UTF-32 char code
+ int hsub, vsub; // chroma subsampling values
int is_packed_rgb;
- int pixel_step[4]; ///< distance in bytes between the
component of each pixel
- uint8_t rgba_map[4]; ///< map RGBA offsets to the positions in
the packed RGBA format
- uint8_t *box_line[4]; ///< line used for filling the box
background
+ int pixel_step[4]; // distance in bytes between the component
of each pixel
+ uint8_t rgba_map[4]; // map RGBA offsets to the positions in
the packed RGBA format
+ uint8_t *box_line[4]; // line used for filling the box background
char *x_expr, *y_expr;
- AVExpr *x_pexpr, *y_pexpr; ///< parsed expressions for x and y
+ AVExpr *x_pexpr, *y_pexpr; // parsed expressions for x and y
double var_values[VAR_VARS_NB];
char *d_expr;
AVExpr *d_pexpr;
- int draw; ///< set to zero to prevent drawing
+ int draw; // set to zero to prevent drawing
char *a_expr;
AVExpr *a_pexpr;
int alpha;
- AVLFG prng; ///< random
+ AVLFG prng; // random
} DrawTextContext;
#define OFFSET(x) offsetof(DrawTextContext, x)
@@ -231,7 +231,7 @@ struct ft_error
typedef struct Glyph {
FT_Glyph *glyph;
uint32_t code;
- FT_Bitmap bitmap; ///< array holding bitmaps of font
+ FT_Bitmap bitmap; // array holding bitmaps of font
FT_BBox bbox;
int advance;
int bitmap_left;
@@ -245,7 +245,7 @@ static int glyph_cmp(void *key, const void *b)
return diff > 0 ? 1 : diff < 0 ? -1 : 0;
}
-/**
+/*
* Load glyphs corresponding to the UTF-32 codepoint code.
*/
static int load_glyph(AVFilterContext *ctx, Glyph **glyph_ptr, uint32_t code)
--
1.9.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
