xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-26 04:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
dcbf72836c
FFmpeg/libavfilter/vf_drawtext.c

1002 lines
35 KiB
C
Raw Normal View History

lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
/*
* Copyright (c) 2011 Stefano Sabatini
* Copyright (c) 2010 S.N. Hemanth Meenakshisundaram
* Copyright (c) 2003 Gustavo Sverzut Barbieri <gsbarbieri@yahoo.com.br>
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
Remove some stray unnecessary ffmpeg references.
2011-10-30 16:56:57 +00:00
* drawtext filter, based on the original vhook/drawtext.c
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
* filter by Gustavo Sverzut Barbieri
*/
#include <sys/time.h>
#include <time.h>
drawtext: fix hard dependency to lavc (timecode).
2011-12-28 09:09:45 +00:00
#include "config.h"
drawtext: allow burning the timecode.
2011-12-06 10:19:11 +00:00
#include "libavutil/avstring.h"
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
#include "libavutil/bprint.h"
Add more missing includes after removing the implicit common.h Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-16 07:22:31 +00:00
#include "libavutil/common.h"
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
#include "libavutil/file.h"
vf_drawtext: cosmetics to reduce diff to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:27:13 +00:00
#include "libavutil/eval.h"
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
#include "libavutil/opt.h"
drawtext: introduce rand(min, max) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-04 23:56:21 +00:00
#include "libavutil/random_seed.h"
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
#include "libavutil/parseutils.h"
drawtext: use new public timecode API.
2012-01-16 10:41:39 +00:00
#include "libavutil/timecode.h"
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
#include "libavutil/tree.h"
drawtext: introduce rand(min, max) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-04 23:56:21 +00:00
#include "libavutil/lfg.h"
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
#include "avfilter.h"
#include "drawutils.h"
lavfi: make formats API private on next bump. It is only useful inside filters and we don't allow user filters for now.
2012-05-30 08:12:55 +00:00
#include "formats.h"
lavfi: make AVFilterPad opaque after two major bumps. It will allow adding new fields to it without ABI breaks.
2012-06-12 18:12:42 +00:00
#include "internal.h"
lavfi: remove avfilter_null_* from public API on next bump. Those functions are only useful inside filters. It is better to not support user filters until the API is more stable.
2012-05-19 08:37:56 +00:00
#include "video.h"
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
#undef time
#include <ft2build.h>
#include <freetype/config/ftheader.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
vf_drawtext: fontconfig support.
2012-04-07 13:09:16 +00:00
#if CONFIG_FONTCONFIG
#include <fontconfig/fontconfig.h>
#endif
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
Mark mutable static data const where appropriate.
2012-02-20 08:42:33 +00:00
static const char *const var_names[] = {
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
"dar",
"hsub", "vsub",
"line_h", "lh", ///< line height, same as max_glyph_h
vf_drawtext: support W/H parameters to reduce UI differences to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 14:29:26 +00:00
"main_h", "h", "H", ///< height of the input video
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
"main_w", "w", "W", ///< width of the input video
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
"max_glyph_a", "ascent", ///< max glyph ascent
"max_glyph_d", "descent", ///< min glyph descent
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
"max_glyph_h", ///< max glyph height
"max_glyph_w", ///< max glyph width
"n", ///< number of frame
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
"sar",
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
"t", ///< timestamp expressed in seconds
"text_h", "th", ///< height of the rendered text
"text_w", "tw", ///< width of the rendered text
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
"x",
"y",
NULL
};
Mark mutable static data const where appropriate.
2012-02-20 08:42:33 +00:00
static const char *const fun2_names[] = {
"rand"
drawtext: introduce rand(min, max) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-04 23:56:21 +00:00
};
static double drand(void *opaque, double min, double max)
{
drawtext: remove typo It slipped through the last two iterations.
2011-12-07 19:30:55 +00:00
return min + (max-min) / UINT_MAX * av_lfg_get(opaque);
drawtext: introduce rand(min, max) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-04 23:56:21 +00:00
}
typedef double (*eval_func2)(void *, double a, double b);
static const eval_func2 fun2[] = {
drand,
NULL
};
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
enum var_name {
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
VAR_DAR,
VAR_HSUB, VAR_VSUB,
VAR_LINE_H, VAR_LH,
vf_drawtext: support W/H parameters to reduce UI differences to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 14:29:26 +00:00
VAR_MAIN_H, VAR_h, VAR_H,
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
VAR_MAIN_W, VAR_w, VAR_W,
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
VAR_MAX_GLYPH_A, VAR_ASCENT,
VAR_MAX_GLYPH_D, VAR_DESCENT,
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
VAR_MAX_GLYPH_H,
VAR_MAX_GLYPH_W,
VAR_N,
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
VAR_SAR,
lavfi/drawtext: alphabetically sort the expression parameters
2012-05-01 09:37:15 +00:00
VAR_T,
VAR_TEXT_H, VAR_TH,
VAR_TEXT_W, VAR_TW,
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
VAR_X,
VAR_Y,
VAR_VARS_NB
};
lavfi/drawtext: implement more generic expansion. The new expansion mechanism uses the %{...} notation. For compatibility reasons, it must be enabled explicitly, but a warning is printed if a conflict is likely to happen.
2012-11-10 18:46:37 +00:00
enum expansion_mode {
EXP_NONE,
EXP_NORMAL,
EXP_STRFTIME,
};
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
typedef struct {
const AVClass *class;
lavfi/drawtext: implement more generic expansion. The new expansion mechanism uses the %{...} notation. For compatibility reasons, it must be enabled explicitly, but a warning is printed if a conflict is likely to happen.
2012-11-10 18:46:37 +00:00
enum expansion_mode exp_mode; ///< expansion mode to use for the text
vf_drawtext: do not reset "n" variable to 0 in case the filter is reinited
2011-09-23 13:37:47 +00:00
int reinit; ///< tells if the filter is being reinited
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
uint8_t *fontfile; ///< font to be used
uint8_t *text; ///< text to be drawn
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
AVBPrint expanded_text; ///< used to contain the expanded text
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
int ft_load_flags; ///< flags used for loading fonts, see FT_LOAD_*
FT_Vector *positions; ///< positions for each element in the text
drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207.
2011-05-16 18:11:50 +00:00
size_t nb_positions; ///< number of elements of positions array
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
char *textfile; ///< file with text to be drawn
vf_drawtext: prefer int over unsigned int This avoids overflow errors when the considered x and y values are negative, as required by the incoming patches.
2011-09-20 00:17:08 +00:00
int x; ///< x position to start drawing text
int y; ///< y position to start drawing text
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
int max_glyph_w; ///< max glyph width
cosmetics: fix some typos Patch attached. From 2d4094fc0dcb4ccd0735eb7e1719e228ebb56bb9 Mon Sep 17 00:00:00 2001 From: Lou Logan <lou@lrcd.com> Date: Mon, 12 Mar 2012 14:13:44 -0800 Subject: [PATCH] cosmetics: fix some typos Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-12 22:30:13 +00:00
int max_glyph_h; ///< max glyph height
drawtext: add shadow support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:41:52 +00:00
int shadowx, shadowy;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
unsigned int fontsize; ///< font size to use
char *fontcolor_string; ///< font color as string
char *boxcolor_string; ///< box color as string
drawtext: add shadow support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:41:52 +00:00
char *shadowcolor_string; ///< shadow color as string
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
short int draw_box; ///< draw box around text - true or false
int use_kerning; ///< font kerning is used - true/false
int tabsize; ///< tab size
drawtext: add 'fix_bounds' option on coords fixing Before, drawtext filter deliberately altered given text coordinates if text didn't fully fit on the picture. This breaks the use case of scrolling large text, e.g. movie closing credits. Add 'fix_bounds', to make it usable in such cases (by setting its value to 0). Default behavior is not changed, and non-fitting text coords are fixed. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-02-05 12:41:01 +00:00
int fix_bounds; ///< do we let it go out of frame bounds - t/f
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
FFDrawContext dc;
FFDrawColor fontcolor; ///< foreground color
FFDrawColor shadowcolor; ///< shadow color
FFDrawColor boxcolor; ///< background color
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
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
vf_drawtext: cosmetics to reduce diff to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:27:13 +00:00
char *x_expr; ///< expression for x position
char *y_expr; ///< expression for y position
AVExpr *x_pexpr, *y_pexpr; ///< parsed expressions for x and y
vf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0 the basetime argument also enables useage of pts instead of time() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-30 21:37:49 +00:00
int64_t basetime; ///< base pts time in the real world for display
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
double var_values[VAR_VARS_NB];
lavfi/drawtext: rename and document variables d_expr and d_pexpr Use the more expressive names draw_expr and draw_pexpr, also more consistent.
2012-05-01 10:57:36 +00:00
char *draw_expr; ///< expression for draw
AVExpr *draw_pexpr; ///< parsed expression for draw
drawtext: make x and y parametric Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H", "text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with vf_overlay and refactor the code accordingly.
2011-12-01 10:43:11 +00:00
int draw; ///< set to zero to prevent drawing
drawtext: introduce rand(min, max) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-04 23:56:21 +00:00
AVLFG prng; ///< random
drawtext: use new public timecode API.
2012-01-16 10:41:39 +00:00
char *tc_opt_string; ///< specified timecode option string
AVRational tc_rate; ///< frame rate for timecode
AVTimecode tc; ///< timecode context
lavfi/drawtext: add 24 hours wrapping option for timecode. Fixes ticket #1044.
2012-03-12 08:16:04 +00:00
int tc24hmax; ///< 1 if timecode is wrapped to 24 hours, 0 otherwise
drawtext: allow burning the timecode.
2011-12-06 10:19:11 +00:00
int frame_id;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
} DrawTextContext;
#define OFFSET(x) offsetof(DrawTextContext, x)
lavfi: add priv class to filter definitions and flags to filter internal options This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-13 11:40:01 +00:00
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
static const AVOption drawtext_options[]= {
lavfi: add priv class to filter definitions and flags to filter internal options This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-13 11:40:01 +00:00
{"fontfile", "set font file", OFFSET(fontfile), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS},
{"text", "set text", OFFSET(text), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS},
{"textfile", "set text file", OFFSET(textfile), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS},
{"fontcolor", "set foreground color", OFFSET(fontcolor_string), AV_OPT_TYPE_STRING, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS},
{"boxcolor", "set box color", OFFSET(boxcolor_string), AV_OPT_TYPE_STRING, {.str="white"}, CHAR_MIN, CHAR_MAX, FLAGS},
{"shadowcolor", "set shadow color", OFFSET(shadowcolor_string), AV_OPT_TYPE_STRING, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS},
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 12:26:01 +00:00
{"box", "set box", OFFSET(draw_box), AV_OPT_TYPE_INT, {.i64=0}, 0, 1 , FLAGS},
{"fontsize", "set font size", OFFSET(fontsize), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX , FLAGS},
lavfi: add priv class to filter definitions and flags to filter internal options This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-13 11:40:01 +00:00
{"x", "set x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX, FLAGS},
{"y", "set y expression", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX, FLAGS},
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 12:26:01 +00:00
{"shadowx", "set x", OFFSET(shadowx), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX , FLAGS},
{"shadowy", "set y", OFFSET(shadowy), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX , FLAGS},
{"tabsize", "set tab size", OFFSET(tabsize), AV_OPT_TYPE_INT, {.i64=4}, 0, INT_MAX , FLAGS},
Merge remote-tracking branch 'qatar/master' * qatar/master: utvideodec: Fix single symbol mode decoding truespeech: drop useless casts libavcodec: drop bogus dependencies from mpc[78] and qdm2 mpegaudio: move ff_mpa_enwindow to a separate file AVOptions: store defaults for INT64 options in int64 union member. Conflicts: libavcodec/Makefile libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 12:51:51 +00:00
{"basetime", "set base time", OFFSET(basetime), AV_OPT_TYPE_INT64, {.i64=AV_NOPTS_VALUE}, INT64_MIN, INT64_MAX , FLAGS},
lavfi: add priv class to filter definitions and flags to filter internal options This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-13 11:40:01 +00:00
{"draw", "if false do not draw", OFFSET(draw_expr), AV_OPT_TYPE_STRING, {.str="1"}, CHAR_MIN, CHAR_MAX, FLAGS},
lavfi/drawtext: implement more generic expansion. The new expansion mechanism uses the %{...} notation. For compatibility reasons, it must be enabled explicitly, but a warning is printed if a conflict is likely to happen.
2012-11-10 18:46:37 +00:00
{"expansion","set the expansion mode", OFFSET(exp_mode), AV_OPT_TYPE_INT, {.i64=EXP_STRFTIME}, 0, 2, FLAGS, "expansion"},
{"none", "set no expansion", OFFSET(exp_mode), AV_OPT_TYPE_CONST, {.i64=EXP_NONE}, 0, 0, FLAGS, "expansion"},
{"normal", "set normal expansion", OFFSET(exp_mode), AV_OPT_TYPE_CONST, {.i64=EXP_NORMAL}, 0, 0, FLAGS, "expansion"},
{"strftime", "set strftime expansion (deprecated)", OFFSET(exp_mode), AV_OPT_TYPE_CONST, {.i64=EXP_STRFTIME}, 0, 0, FLAGS, "expansion"},
lavfi: add priv class to filter definitions and flags to filter internal options This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-13 11:40:01 +00:00
{"timecode", "set initial timecode", OFFSET(tc_opt_string), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS},
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 12:26:01 +00:00
{"tc24hmax", "set 24 hours max (timecode only)", OFFSET(tc24hmax), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS},
lavfi: add priv class to filter definitions and flags to filter internal options This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-13 11:40:01 +00:00
{"timecode_rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS},
{"r", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS},
{"rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX, FLAGS},
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 12:26:01 +00:00
{"fix_bounds", "if true, check and fix text coords to avoid clipping", OFFSET(fix_bounds), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS},
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
/* FT_LOAD_* flags */
Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078' * commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 12:09:09 +00:00
{"ft_load_flags", "set font loading flags for libfreetype", OFFSET(ft_load_flags), AV_OPT_TYPE_FLAGS, {.i64=FT_LOAD_DEFAULT|FT_LOAD_RENDER}, 0, INT_MAX, FLAGS, "ft_load_flags"},
Merge commit '124134e42455763b28cc346fed1d07017a76e84e' * commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 11:58:11 +00:00
{"default", "set default", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_DEFAULT}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"no_scale", "set no_scale", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_NO_SCALE}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"no_hinting", "set no_hinting", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_NO_HINTING}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"render", "set render", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_RENDER}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"no_bitmap", "set no_bitmap", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_NO_BITMAP}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"vertical_layout", "set vertical_layout", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_VERTICAL_LAYOUT}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"force_autohint", "set force_autohint", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_FORCE_AUTOHINT}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"crop_bitmap", "set crop_bitmap", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_CROP_BITMAP}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"pedantic", "set pedantic", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_PEDANTIC}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"ignore_global_advance_width", "set ignore_global_advance_width", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"no_recurse", "set no_recurse", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_NO_RECURSE}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"ignore_transform", "set ignore_transform", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_IGNORE_TRANSFORM}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"monochrome", "set monochrome", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_MONOCHROME}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"linear_design", "set linear_design", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_LINEAR_DESIGN}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
{"no_autohint", "set no_autohint", 0, AV_OPT_TYPE_CONST, {.i64=FT_LOAD_NO_AUTOHINT}, INT_MIN, INT_MAX, FLAGS, "ft_load_flags"},
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
{NULL},
};
lavfi: define macro AVFILTER_DEFINE_CLASS The macro can be used to define consistently the internal class of a filter, save some typing and factorize.
2012-06-22 12:33:09 +00:00
AVFILTER_DEFINE_CLASS(drawtext);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
#undef __FTERRORS_H__
#define FT_ERROR_START_LIST {
#define FT_ERRORDEF(e, v, s) { (e), (s) },
#define FT_ERROR_END_LIST { 0, NULL } };
struct ft_error
{
int err;
const char *err_msg;
} static ft_errors[] =
#include FT_ERRORS_H
#define FT_ERRMSG(e) ft_errors[e].err_msg
typedef struct {
FT_Glyph *glyph;
uint32_t code;
FT_Bitmap bitmap; ///< array holding bitmaps of font
FT_BBox bbox;
int advance;
int bitmap_left;
int bitmap_top;
} Glyph;
static int glyph_cmp(void *key, const void *b)
{
const Glyph *a = key, *bb = b;
int64_t diff = (int64_t)a->code - (int64_t)bb->code;
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)
{
DrawTextContext *dtext = ctx->priv;
Glyph *glyph;
struct AVTreeNode *node = NULL;
int ret;
/* load glyph into dtext->face->glyph */
if (FT_Load_Char(dtext->face, code, dtext->ft_load_flags))
return AVERROR(EINVAL);
/* save glyph */
if (!(glyph = av_mallocz(sizeof(*glyph))) ||
!(glyph->glyph = av_mallocz(sizeof(*glyph->glyph)))) {
ret = AVERROR(ENOMEM);
goto error;
}
glyph->code = code;
if (FT_Get_Glyph(dtext->face->glyph, glyph->glyph)) {
ret = AVERROR(EINVAL);
goto error;
}
glyph->bitmap = dtext->face->glyph->bitmap;
glyph->bitmap_left = dtext->face->glyph->bitmap_left;
glyph->bitmap_top = dtext->face->glyph->bitmap_top;
glyph->advance = dtext->face->glyph->advance.x >> 6;
/* measure text height to calculate text_height (or the maximum text height) */
FT_Glyph_Get_CBox(*glyph->glyph, ft_glyph_bbox_pixels, &glyph->bbox);
/* cache the newly created glyph */
vf_drawtext: do not use deprecated av_tree_node_size
2012-11-02 09:56:30 +00:00
if (!(node = av_tree_node_alloc())) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
ret = AVERROR(ENOMEM);
goto error;
}
av_tree_insert(&dtext->glyphs, glyph, glyph_cmp, &node);
if (glyph_ptr)
*glyph_ptr = glyph;
return 0;
error:
if (glyph)
av_freep(&glyph->glyph);
av_freep(&glyph);
av_freep(&node);
return ret;
}
vf_drawtext: fontconfig support.
2012-04-07 13:09:16 +00:00
static int load_font_file(AVFilterContext *ctx, const char *path, int index,
const char **error)
{
DrawTextContext *dtext = ctx->priv;
int err;
err = FT_New_Face(dtext->library, path, index, &dtext->face);
if (err) {
*error = FT_ERRMSG(err);
return AVERROR(EINVAL);
}
return 0;
}
#if CONFIG_FONTCONFIG
static int load_font_fontconfig(AVFilterContext *ctx, const char **error)
{
DrawTextContext *dtext = ctx->priv;
FcConfig *fontconfig;
FcPattern *pattern, *fpat;
FcResult result = FcResultMatch;
FcChar8 *filename;
int err, index;
double size;
fontconfig = FcInitLoadConfigAndFonts();
if (!fontconfig) {
*error = "impossible to init fontconfig\n";
return AVERROR(EINVAL);
}
pattern = FcNameParse(dtext->fontfile ? dtext->fontfile :
(uint8_t *)(intptr_t)"default");
if (!pattern) {
*error = "could not parse fontconfig pattern";
return AVERROR(EINVAL);
}
if (!FcConfigSubstitute(fontconfig, pattern, FcMatchPattern)) {
*error = "could not substitue fontconfig options"; /* very unlikely */
return AVERROR(EINVAL);
}
FcDefaultSubstitute(pattern);
fpat = FcFontMatch(fontconfig, pattern, &result);
if (!fpat || result != FcResultMatch) {
*error = "impossible to find a matching font";
return AVERROR(EINVAL);
}
if (FcPatternGetString (fpat, FC_FILE, 0, &filename) != FcResultMatch ||
FcPatternGetInteger(fpat, FC_INDEX, 0, &index ) != FcResultMatch ||
FcPatternGetDouble (fpat, FC_SIZE, 0, &size ) != FcResultMatch) {
*error = "impossible to find font information";
return AVERROR(EINVAL);
}
av_log(ctx, AV_LOG_INFO, "Using \"%s\"\n", filename);
if (!dtext->fontsize)
dtext->fontsize = size + 0.5;
err = load_font_file(ctx, filename, index, error);
if (err)
return err;
FcPatternDestroy(fpat);
FcPatternDestroy(pattern);
FcConfigDestroy(fontconfig);
return 0;
}
#endif
static int load_font(AVFilterContext *ctx)
{
DrawTextContext *dtext = ctx->priv;
int err;
const char *error = "unknown error\n";
/* load the face, and set up the encoding, which is by default UTF-8 */
err = load_font_file(ctx, dtext->fontfile, 0, &error);
if (!err)
return 0;
#if CONFIG_FONTCONFIG
err = load_font_fontconfig(ctx, &error);
if (!err)
return 0;
#endif
av_log(ctx, AV_LOG_ERROR, "Could not load font \"%s\": %s\n",
dtext->fontfile, error);
return err;
}
lavfi: remove 'opaque' parameter from AVFilter.init() It is not used in any filters currently and is inherently evil. If passing binary data to filters is required in the future, it should be done with some AVOptions-based system.
2012-06-21 05:55:56 +00:00
static av_cold int init(AVFilterContext *ctx, const char *args)
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
{
int err;
DrawTextContext *dtext = ctx->priv;
Glyph *glyph;
dtext->class = &drawtext_class;
AVOptions: deprecate av_opt_set_defaults2 It's a hack which was created to allow for multiple options with different defaults to refer to same field (e.g. 'b' vs 'ab'). There is no need for it anymore.
2011-09-04 09:42:41 +00:00
av_opt_set_defaults(dtext);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
Remove "Error parsing options string [...]" messages. This reduces from 3 to 2 messages for the same syntax error in ffprobe, and from 4 to 3 in filters.
2012-08-08 22:49:27 +00:00
if ((err = av_set_options_string(dtext, args, "=", ":")) < 0)
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
return err;
vf_drawtext: fontconfig support.
2012-04-07 13:09:16 +00:00
if (!dtext->fontfile && !CONFIG_FONTCONFIG) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
av_log(ctx, AV_LOG_ERROR, "No font filename provided\n");
return AVERROR(EINVAL);
}
if (dtext->textfile) {
uint8_t *textbuf;
size_t textbuf_size;
if (dtext->text) {
av_log(ctx, AV_LOG_ERROR,
"Both text and text file provided. Please provide only one\n");
return AVERROR(EINVAL);
}
if ((err = av_file_map(dtext->textfile, &textbuf, &textbuf_size, 0, ctx)) < 0) {
av_log(ctx, AV_LOG_ERROR,
"The text file '%s' could not be read or is empty\n",
dtext->textfile);
return err;
}
if (!(dtext->text = av_malloc(textbuf_size+1)))
return AVERROR(ENOMEM);
memcpy(dtext->text, textbuf, textbuf_size);
dtext->text[textbuf_size] = 0;
av_file_unmap(textbuf, textbuf_size);
}
drawtext: use new public timecode API.
2012-01-16 10:41:39 +00:00
if (dtext->tc_opt_string) {
int ret = av_timecode_init_from_string(&dtext->tc, dtext->tc_rate,
dtext->tc_opt_string, ctx);
if (ret < 0)
return ret;
lavfi/drawtext: add 24 hours wrapping option for timecode. Fixes ticket #1044.
2012-03-12 08:16:04 +00:00
if (dtext->tc24hmax)
dtext->tc.flags |= AV_TIMECODE_FLAG_24HOURSMAX;
drawtext: allow burning the timecode.
2011-12-06 10:19:11 +00:00
if (!dtext->text)
dtext->text = av_strdup("");
}
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
if (!dtext->text) {
av_log(ctx, AV_LOG_ERROR,
drawtext: allow burning the timecode.
2011-12-06 10:19:11 +00:00
"Either text, a valid file or a timecode must be provided\n");
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
return AVERROR(EINVAL);
}
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
if ((err = av_parse_color(dtext->fontcolor.rgba, dtext->fontcolor_string, -1, ctx))) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
av_log(ctx, AV_LOG_ERROR,
"Invalid font color '%s'\n", dtext->fontcolor_string);
return err;
}
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
if ((err = av_parse_color(dtext->boxcolor.rgba, dtext->boxcolor_string, -1, ctx))) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
av_log(ctx, AV_LOG_ERROR,
"Invalid box color '%s'\n", dtext->boxcolor_string);
return err;
}
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
if ((err = av_parse_color(dtext->shadowcolor.rgba, dtext->shadowcolor_string, -1, ctx))) {
drawtext: add shadow support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:41:52 +00:00
av_log(ctx, AV_LOG_ERROR,
"Invalid shadow color '%s'\n", dtext->shadowcolor_string);
return err;
}
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
if ((err = FT_Init_FreeType(&(dtext->library)))) {
av_log(ctx, AV_LOG_ERROR,
"Could not load FreeType: %s\n", FT_ERRMSG(err));
return AVERROR(EINVAL);
}
vf_drawtext: fontconfig support.
2012-04-07 13:09:16 +00:00
err = load_font(ctx);
if (err)
return err;
if (!dtext->fontsize)
dtext->fontsize = 16;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
if ((err = FT_Set_Pixel_Sizes(dtext->face, 0, dtext->fontsize))) {
av_log(ctx, AV_LOG_ERROR, "Could not set font size to %d pixels: %s\n",
dtext->fontsize, FT_ERRMSG(err));
return AVERROR(EINVAL);
}
dtext->use_kerning = FT_HAS_KERNING(dtext->face);
/* load the fallback glyph with code 0 */
load_glyph(ctx, NULL, 0);
/* set the tabsize in pixels */
Fix various if parenthesis misplacements.
2011-11-21 06:50:03 +00:00
if ((err = load_glyph(ctx, &glyph, ' ')) < 0) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
av_log(ctx, AV_LOG_ERROR, "Could not set tabsize.\n");
return err;
}
dtext->tabsize *= glyph->advance;
lavfi/drawtext: implement more generic expansion. The new expansion mechanism uses the %{...} notation. For compatibility reasons, it must be enabled explicitly, but a warning is printed if a conflict is likely to happen.
2012-11-10 18:46:37 +00:00
if (dtext->exp_mode == EXP_STRFTIME &&
(strchr(dtext->text, '%') || strchr(dtext->text, '\\')))
av_log(ctx, AV_LOG_WARNING, "expansion=strftime is deprecated.\n");
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
av_bprint_init(&dtext->expanded_text, 0, AV_BPRINT_SIZE_UNLIMITED);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
return 0;
}
static int query_formats(AVFilterContext *ctx)
{
Merge remote-tracking branch 'qatar/master' * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-05 20:43:44 +00:00
ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
return 0;
}
static int glyph_enu_free(void *opaque, void *elem)
{
vf_drawtext: fix memory leak of glyph data.
2012-04-10 07:55:11 +00:00
Glyph *glyph = elem;
FT_Done_Glyph(*glyph->glyph);
av_freep(&glyph->glyph);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
av_free(elem);
return 0;
}
static av_cold void uninit(AVFilterContext *ctx)
{
DrawTextContext *dtext = ctx->priv;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
av_expr_free(dtext->x_pexpr); dtext->x_pexpr = NULL;
av_expr_free(dtext->y_pexpr); dtext->y_pexpr = NULL;
lavfi/drawtext: rename and document variables d_expr and d_pexpr Use the more expressive names draw_expr and draw_pexpr, also more consistent.
2012-05-01 10:57:36 +00:00
av_expr_free(dtext->draw_pexpr); dtext->draw_pexpr = NULL;
lavfi/drawtext: use av_opt_free() to free private context Simplify code.
2012-06-25 20:41:33 +00:00
av_opt_free(dtext);
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
vf_drawtext: perform misc cosmetics changes to uninit In particular: * lexically sort strings freeing commands * logically group freeing instructions * prefer NULL over 0 when setting dtext->glyphs
2011-09-23 12:13:47 +00:00
av_freep(&dtext->positions);
vf_drawtext: fix segfault on reinit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-30 17:47:23 +00:00
dtext->nb_positions = 0;
vf_drawtext: perform misc cosmetics changes to uninit In particular: * lexically sort strings freeing commands * logically group freeing instructions * prefer NULL over 0 when setting dtext->glyphs
2011-09-23 12:13:47 +00:00
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
av_tree_enumerate(dtext->glyphs, NULL, NULL, glyph_enu_free);
av_tree_destroy(dtext->glyphs);
vf_drawtext: perform misc cosmetics changes to uninit In particular: * lexically sort strings freeing commands * logically group freeing instructions * prefer NULL over 0 when setting dtext->glyphs
2011-09-23 12:13:47 +00:00
dtext->glyphs = NULL;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
FT_Done_Face(dtext->face);
FT_Done_FreeType(dtext->library);
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
av_bprint_finalize(&dtext->expanded_text, NULL);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
}
vf_drawtext: cosmetics to reduce diff to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:27:13 +00:00
static inline int is_newline(uint32_t c)
{
cosmetics: Drop unnecessary parentheses around return values.
2011-12-29 21:23:16 +00:00
return c == '\n' || c == '\r' || c == '\f' || c == '\v';
vf_drawtext: cosmetics to reduce diff to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:27:13 +00:00
}
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
static int config_input(AVFilterLink *inlink)
{
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
AVFilterContext *ctx = inlink->dst;
vf_drawtext: cosmetics to reduce diff to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:27:13 +00:00
DrawTextContext *dtext = ctx->priv;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
int ret;
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
ff_draw_init(&dtext->dc, inlink->format, 0);
ff_draw_color(&dtext->dc, &dtext->fontcolor, dtext->fontcolor.rgba);
ff_draw_color(&dtext->dc, &dtext->shadowcolor, dtext->shadowcolor.rgba);
ff_draw_color(&dtext->dc, &dtext->boxcolor, dtext->boxcolor.rgba);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
vf_drawtext: support W/H parameters to reduce UI differences to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 14:29:26 +00:00
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_H] = dtext->var_values[VAR_MAIN_H] = inlink->h;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
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];
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
dtext->var_values[VAR_HSUB] = 1 << dtext->dc.hsub_max;
dtext->var_values[VAR_VSUB] = 1 << dtext->dc.vsub_max;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
dtext->var_values[VAR_X] = NAN;
dtext->var_values[VAR_Y] = NAN;
vf_drawtext: do not reset "n" variable to 0 in case the filter is reinited
2011-09-23 13:37:47 +00:00
if (!dtext->reinit)
dtext->var_values[VAR_N] = 0;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
dtext->var_values[VAR_T] = NAN;
Merge remote-tracking branch 'qatar/master' * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07 23:23:37 +00:00
av_lfg_init(&dtext->prng, av_get_random_seed());
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
if ((ret = av_expr_parse(&dtext->x_pexpr, dtext->x_expr, var_names,
Merge remote-tracking branch 'qatar/master' * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07 23:23:37 +00:00
NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
(ret = av_expr_parse(&dtext->y_pexpr, dtext->y_expr, var_names,
Merge remote-tracking branch 'qatar/master' * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07 23:23:37 +00:00
NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
lavfi/drawtext: rename and document variables d_expr and d_pexpr Use the more expressive names draw_expr and draw_pexpr, also more consistent.
2012-05-01 10:57:36 +00:00
(ret = av_expr_parse(&dtext->draw_pexpr, dtext->draw_expr, var_names,
Merge remote-tracking branch 'qatar/master' * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07 23:23:37 +00:00
NULL, NULL, fun2_names, fun2, 0, ctx)) < 0)
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
return AVERROR(EINVAL);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
return 0;
}
drawtext: Support changing parameters through reinit command at runtime. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-28 18:47:33 +00:00
static int command(AVFilterContext *ctx, const char *cmd, const char *arg, char *res, int res_len, int flags)
{
vf_drawtext: do not reset "n" variable to 0 in case the filter is reinited
2011-09-23 13:37:47 +00:00
DrawTextContext *dtext = ctx->priv;
vf_drawtext: apply misc style fixes
2011-09-25 20:38:32 +00:00
if (!strcmp(cmd, "reinit")) {
vf_drawtext: Fix reinit to allow color changes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-04 18:47:17 +00:00
int ret;
drawtext: Support changing parameters through reinit command at runtime. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-28 18:47:33 +00:00
uninit(ctx);
vf_drawtext: do not reset "n" variable to 0 in case the filter is reinited
2011-09-23 13:37:47 +00:00
dtext->reinit = 1;
Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' * commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build Conflicts: ffmpeg.c libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-26 21:27:59 +00:00
if ((ret = init(ctx, arg)) < 0)
vf_drawtext: Fix reinit to allow color changes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-04 18:47:17 +00:00
return ret;
return config_input(ctx->inputs[0]);
drawtext: Support changing parameters through reinit command at runtime. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-28 18:47:33 +00:00
}
return AVERROR(ENOSYS);
}
lavfi/drawtext: implement more generic expansion. The new expansion mechanism uses the %{...} notation. For compatibility reasons, it must be enabled explicitly, but a warning is printed if a conflict is likely to happen.
2012-11-10 18:46:37 +00:00
static int func_pts(AVFilterContext *ctx, AVBPrint *bp,
char *fct, unsigned argc, char **argv, int tag)
{
DrawTextContext *dtext = ctx->priv;
av_bprintf(bp, "%.6f", dtext->var_values[VAR_T]);
return 0;
}
#if !HAVE_LOCALTIME_R
static void localtime_r(const time_t *t, struct tm *tm)
{
*tm = *localtime(t);
}
#endif
static int func_strftime(AVFilterContext *ctx, AVBPrint *bp,
char *fct, unsigned argc, char **argv, int tag)
{
const char *fmt = argc ? argv[0] : "%Y-%m-%d %H:%M:%S";
time_t now;
struct tm tm;
time(&now);
if (tag == 'L')
localtime_r(&now, &tm);
else
tm = *gmtime(&now);
av_bprint_strftime(bp, fmt, &tm);
return 0;
}
static const struct drawtext_function {
const char *name;
unsigned argc_min, argc_max;
int tag; /** opaque argument to func */
int (*func)(AVFilterContext *, AVBPrint *, char *, unsigned, char **, int);
} functions[] = {
{ "pts", 0, 0, 0, func_pts },
{ "gmtime", 0, 1, 'G', func_strftime },
{ "localtime", 0, 1, 'L', func_strftime },
};
static int eval_function(AVFilterContext *ctx, AVBPrint *bp, char *fct,
unsigned argc, char **argv)
{
unsigned i;
for (i = 0; i < FF_ARRAY_ELEMS(functions); i++) {
if (strcmp(fct, functions[i].name))
continue;
if (argc < functions[i].argc_min) {
av_log(ctx, AV_LOG_ERROR, "%%{%s} requires at least %d arguments\n",
fct, functions[i].argc_min);
return AVERROR(EINVAL);
}
if (argc > functions[i].argc_max) {
av_log(ctx, AV_LOG_ERROR, "%%{%s} requires at most %d arguments\n",
fct, functions[i].argc_max);
return AVERROR(EINVAL);
}
break;
}
if (i >= FF_ARRAY_ELEMS(functions)) {
av_log(ctx, AV_LOG_ERROR, "%%{%s} is not known\n", fct);
return AVERROR(EINVAL);
}
return functions[i].func(ctx, bp, fct, argc, argv, functions[i].tag);
}
static int expand_function(AVFilterContext *ctx, AVBPrint *bp, char **rtext)
{
const char *text = *rtext;
char *argv[16] = { NULL };
unsigned argc = 0, i;
int ret;
if (*text != '{') {
av_log(ctx, AV_LOG_ERROR, "Stray %% near '%s'\n", text);
return AVERROR(EINVAL);
}
text++;
while (1) {
if (!(argv[argc++] = av_get_token(&text, ":}"))) {
ret = AVERROR(ENOMEM);
goto end;
}
if (!*text) {
av_log(ctx, AV_LOG_ERROR, "Unterminated %%{} near '%s'\n", *rtext);
ret = AVERROR(EINVAL);
goto end;
}
if (argc == FF_ARRAY_ELEMS(argv))
av_freep(&argv[--argc]); /* error will be caught later */
if (*text == '}')
break;
text++;
}
if ((ret = eval_function(ctx, bp, argv[0], argc - 1, argv + 1)) < 0)
goto end;
ret = 0;
*rtext = (char *)text + 1;
end:
for (i = 0; i < argc; i++)
av_freep(&argv[i]);
return ret;
}
static int expand_text(AVFilterContext *ctx)
{
DrawTextContext *dtext = ctx->priv;
char *text = dtext->text;
AVBPrint *bp = &dtext->expanded_text;
int ret;
av_bprint_clear(bp);
while (*text) {
if (*text == '\\' && text[1]) {
av_bprint_chars(bp, text[1], 1);
text += 2;
} else if (*text == '%') {
text++;
if ((ret = expand_function(ctx, bp, &text)) < 0)
return ret;
} else {
av_bprint_chars(bp, *text, 1);
text++;
}
}
if (!av_bprint_is_complete(bp))
return AVERROR(ENOMEM);
return 0;
}
drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:11:35 +00:00
static int draw_glyphs(DrawTextContext *dtext, AVFilterBufferRef *picref,
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
int width, int height, const uint8_t rgbcolor[4], FFDrawColor *color, int x, int y)
drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:11:35 +00:00
{
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
char *text = dtext->expanded_text.str;
drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:11:35 +00:00
uint32_t code = 0;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
int i, x1, y1;
drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:11:35 +00:00
uint8_t *p;
Glyph *glyph = NULL;
for (i = 0, p = text; *p; i++) {
Glyph dummy = { 0 };
GET_UTF8(code, *p++, continue;);
/* skip new line chars, just go to new line */
if (code == '\n' || code == '\r' || code == '\t')
continue;
dummy.code = code;
glyph = av_tree_find(dtext->glyphs, &dummy, (void *)glyph_cmp, NULL);
if (glyph->bitmap.pixel_mode != FT_PIXEL_MODE_MONO &&
glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
return AVERROR(EINVAL);
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
x1 = dtext->positions[i].x+dtext->x+x;
y1 = dtext->positions[i].y+dtext->y+y;
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
ff_blend_mask(&dtext->dc, color,
picref->data, picref->linesize, width, height,
glyph->bitmap.buffer, glyph->bitmap.pitch,
glyph->bitmap.width, glyph->bitmap.rows,
glyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO ? 0 : 3,
0, x1, y1);
drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:11:35 +00:00
}
return 0;
}
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
static int draw_text(AVFilterContext *ctx, AVFilterBufferRef *picref,
int width, int height)
{
DrawTextContext *dtext = ctx->priv;
uint32_t code = 0, prev_code = 0;
drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:11:35 +00:00
int x = 0, y = 0, i = 0, ret;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
int max_text_line_w = 0, len;
int box_w, box_h;
drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207.
2011-05-16 18:11:50 +00:00
char *text = dtext->text;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
uint8_t *p;
int y_min = 32000, y_max = -32000;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
int x_min = 32000, x_max = -32000;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
FT_Vector delta;
Glyph *glyph = NULL, *prev_glyph = NULL;
Glyph dummy = { 0 };
drawtext: reindent after the previous commit
2011-05-16 21:48:00 +00:00
time_t now = time(0);
struct tm ltime;
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
AVBPrint *bp = &dtext->expanded_text;
av_bprint_clear(bp);
drawtext: reindent after the previous commit
2011-05-16 21:48:00 +00:00
vf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0 the basetime argument also enables useage of pts instead of time() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-30 21:37:49 +00:00
if(dtext->basetime != AV_NOPTS_VALUE)
now= picref->pts*av_q2d(ctx->inputs[0]->time_base) + dtext->basetime/1000000;
lavfi/drawtext: implement more generic expansion. The new expansion mechanism uses the %{...} notation. For compatibility reasons, it must be enabled explicitly, but a warning is printed if a conflict is likely to happen.
2012-11-10 18:46:37 +00:00
switch (dtext->exp_mode) {
case EXP_NONE:
av_bprintf(bp, "%s", dtext->text);
break;
case EXP_NORMAL:
if ((ret = expand_text(ctx)) < 0)
return ret;
break;
case EXP_STRFTIME:
localtime_r(&now, &ltime);
av_bprint_strftime(bp, dtext->text, &ltime);
break;
}
drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207.
2011-05-16 18:11:50 +00:00
drawtext: use new public timecode API.
2012-01-16 10:41:39 +00:00
if (dtext->tc_opt_string) {
char tcbuf[AV_TIMECODE_STR_SIZE];
av_timecode_make_string(&dtext->tc, tcbuf, dtext->frame_id++);
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
av_bprint_clear(bp);
av_bprintf(bp, "%s%s", dtext->text, tcbuf);
drawtext: allow burning the timecode.
2011-12-06 10:19:11 +00:00
}
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
if (!av_bprint_is_complete(bp))
drawtext: reindent after the previous commit
2011-05-16 21:48:00 +00:00
return AVERROR(ENOMEM);
lavfi/drawtext: use bprint for the expanded text.
2012-11-10 15:06:32 +00:00
text = dtext->expanded_text.str;
if ((len = dtext->expanded_text.len) > dtext->nb_positions) {
drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207.
2011-05-16 18:11:50 +00:00
if (!(dtext->positions =
av_realloc(dtext->positions, len*sizeof(*dtext->positions))))
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
return AVERROR(ENOMEM);
drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207.
2011-05-16 18:11:50 +00:00
dtext->nb_positions = len;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
}
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
x = 0;
y = 0;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
/* load and cache glyphs */
drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207.
2011-05-16 18:11:50 +00:00
for (i = 0, p = text; *p; i++) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
GET_UTF8(code, *p++, continue;);
/* get glyph */
dummy.code = code;
glyph = av_tree_find(dtext->glyphs, &dummy, glyph_cmp, NULL);
Merge remote-tracking branch 'qatar/master' * qatar/master: Revert "v210enc: use FFALIGN()" doxygen: Do not include license boilerplates in Doxygen comment blocks. avplay: reset decoder flush state when seeking ape: skip packets with invalid size ape: calculate final packet size instead of guessing ape: stop reading after the last frame has been read ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished ape: return error if seeking to the current packet fails in ape_read_packet() avcodec: Clarify AVFrame member documentation. v210dec: check for coded_frame allocation failure v210enc: use stride as it is already calculated v210enc: use FFALIGN() v210enc: return proper AVERROR codes instead of -1 v210enc: do not set coded_frame->key_frame v210enc: check for coded_frame allocation failure drawtext: add 'fix_bounds' option on coords fixing drawtext: fix text_{w, h} expression vars drawtext: add missing braces around an if() block. Conflicts: libavcodec/arm/vp8.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/v210dec.c libavfilter/vf_drawtext.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-07 00:40:29 +00:00
if (!glyph) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
load_glyph(ctx, &glyph, code);
Merge remote-tracking branch 'qatar/master' * qatar/master: Revert "v210enc: use FFALIGN()" doxygen: Do not include license boilerplates in Doxygen comment blocks. avplay: reset decoder flush state when seeking ape: skip packets with invalid size ape: calculate final packet size instead of guessing ape: stop reading after the last frame has been read ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished ape: return error if seeking to the current packet fails in ape_read_packet() avcodec: Clarify AVFrame member documentation. v210dec: check for coded_frame allocation failure v210enc: use stride as it is already calculated v210enc: use FFALIGN() v210enc: return proper AVERROR codes instead of -1 v210enc: do not set coded_frame->key_frame v210enc: check for coded_frame allocation failure drawtext: add 'fix_bounds' option on coords fixing drawtext: fix text_{w, h} expression vars drawtext: add missing braces around an if() block. Conflicts: libavcodec/arm/vp8.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/v210dec.c libavfilter/vf_drawtext.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-07 00:40:29 +00:00
}
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
y_min = FFMIN(glyph->bbox.yMin, y_min);
y_max = FFMAX(glyph->bbox.yMax, y_max);
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
x_min = FFMIN(glyph->bbox.xMin, x_min);
x_max = FFMAX(glyph->bbox.xMax, x_max);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
}
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
dtext->max_glyph_h = y_max - y_min;
dtext->max_glyph_w = x_max - x_min;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
/* compute and save position for each glyph */
glyph = NULL;
drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207.
2011-05-16 18:11:50 +00:00
for (i = 0, p = text; *p; i++) {
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
GET_UTF8(code, *p++, continue;);
/* skip the \n in the sequence \r\n */
if (prev_code == '\r' && code == '\n')
continue;
prev_code = code;
if (is_newline(code)) {
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
max_text_line_w = FFMAX(max_text_line_w, x);
y += dtext->max_glyph_h;
x = 0;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
continue;
}
/* get glyph */
prev_glyph = glyph;
dummy.code = code;
glyph = av_tree_find(dtext->glyphs, &dummy, glyph_cmp, NULL);
/* kerning */
if (dtext->use_kerning && prev_glyph && glyph->code) {
FT_Get_Kerning(dtext->face, prev_glyph->code, glyph->code,
ft_kerning_default, &delta);
x += delta.x >> 6;
}
/* save position */
dtext->positions[i].x = x + glyph->bitmap_left;
vf_drawtext: remove useless and misnamed intermediary "baseline" variable in draw_text()
2011-09-21 21:47:44 +00:00
dtext->positions[i].y = y - glyph->bitmap_top + y_max;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
if (code == '\t') x = (x / dtext->tabsize + 1)*dtext->tabsize;
else x += glyph->advance;
}
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
max_text_line_w = FFMAX(x, max_text_line_w);
dtext->var_values[VAR_TW] = dtext->var_values[VAR_TEXT_W] = max_text_line_w;
dtext->var_values[VAR_TH] = dtext->var_values[VAR_TEXT_H] = y + dtext->max_glyph_h;
dtext->var_values[VAR_MAX_GLYPH_W] = dtext->max_glyph_w;
dtext->var_values[VAR_MAX_GLYPH_H] = dtext->max_glyph_h;
dtext->var_values[VAR_MAX_GLYPH_A] = dtext->var_values[VAR_ASCENT ] = y_max;
dtext->var_values[VAR_MAX_GLYPH_D] = dtext->var_values[VAR_DESCENT] = y_min;
dtext->var_values[VAR_LINE_H] = dtext->var_values[VAR_LH] = dtext->max_glyph_h;
Merge remote-tracking branch 'qatar/master' * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07 23:23:37 +00:00
dtext->x = dtext->var_values[VAR_X] = av_expr_eval(dtext->x_pexpr, dtext->var_values, &dtext->prng);
dtext->y = dtext->var_values[VAR_Y] = av_expr_eval(dtext->y_pexpr, dtext->var_values, &dtext->prng);
dtext->x = dtext->var_values[VAR_X] = av_expr_eval(dtext->x_pexpr, dtext->var_values, &dtext->prng);
lavfi/drawtext: rename and document variables d_expr and d_pexpr Use the more expressive names draw_expr and draw_pexpr, also more consistent.
2012-05-01 10:57:36 +00:00
dtext->draw = av_expr_eval(dtext->draw_pexpr, dtext->var_values, &dtext->prng);
Merge remote-tracking branch 'qatar/master' * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07 23:23:37 +00:00
if(!dtext->draw)
return 0;
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
box_w = FFMIN(width - 1 , max_text_line_w);
box_h = FFMIN(height - 1, y + dtext->max_glyph_h);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
/* draw box */
if (dtext->draw_box)
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
ff_blend_rectangle(&dtext->dc, &dtext->boxcolor,
picref->data, picref->linesize, width, height,
dtext->x, dtext->y, box_w, box_h);
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
drawtext: add shadow support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:41:52 +00:00
if (dtext->shadowx || dtext->shadowy) {
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
if ((ret = draw_glyphs(dtext, picref, width, height, dtext->shadowcolor.rgba,
&dtext->shadowcolor, dtext->shadowx, dtext->shadowy)) < 0)
drawtext: add shadow support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:41:52 +00:00
return ret;
}
vf_drawtext: use drawutils.
2012-03-28 13:27:07 +00:00
if ((ret = draw_glyphs(dtext, picref, width, height, dtext->fontcolor.rgba,
&dtext->fontcolor, 0, 0)) < 0)
drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-22 00:11:35 +00:00
return ret;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
return 0;
}
lavfi: add error handling to draw_slice().
2012-07-14 07:25:33 +00:00
static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
return 0;
}
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
Merge remote-tracking branch 'qatar/master' * qatar/master: FATE: fix the asyncts test build: Drop gcc-specific warning flag from header compilation rule FATE: add a test for the asyncts audio filter. matroskadec: return more correct error code on read error. buffersrc: check ff_get_audio_buffer() for errors. lavfi: check all ff_get_video_buffer() calls for errors. lavfi: check all avfilter_ref_buffer() calls for errors. vf_select: avoid an unnecessary avfilter_ref_buffer(). buffersrc: avoid creating unnecessary buffer reference lavfi: use avfilter_unref_bufferp() where appropriate. vf_fps: add more error checks. vf_fps: fix a memleak on malloc failure. lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors lavfi: add error handling to end_frame(). lavfi: add error handling to draw_slice(). lavfi: add error handling to start_frame(). Conflicts: Makefile ffplay.c libavfilter/buffersrc.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 20:57:02 +00:00
static int end_frame(AVFilterLink *inlink)
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
{
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
AVFilterContext *ctx = inlink->dst;
vf_drawtext: use ctx for expressing outlink and dtext in end_frame (Very) slighly improve readability.
2011-09-23 12:28:26 +00:00
AVFilterLink *outlink = ctx->outputs[0];
DrawTextContext *dtext = ctx->priv;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
AVFilterBufferRef *picref = inlink->cur_buf;
lavfi: add error handling to end_frame().
2012-07-14 07:25:33 +00:00
int ret;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
vf_drawtext: make x and y options parametric Address trac issue #378.
2011-09-18 00:41:56 +00:00
dtext->var_values[VAR_T] = picref->pts == AV_NOPTS_VALUE ?
NAN : picref->pts * av_q2d(inlink->time_base);
draw_text(ctx, picref, picref->video->w, picref->video->h);
av_log(ctx, AV_LOG_DEBUG, "n:%d t:%f text_w:%d text_h:%d x:%d y:%d\n",
(int)dtext->var_values[VAR_N], dtext->var_values[VAR_T],
(int)dtext->var_values[VAR_TEXT_W], (int)dtext->var_values[VAR_TEXT_H],
dtext->x, dtext->y);
dtext->var_values[VAR_N] += 1.0;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
lavfi: add error handling to end_frame().
2012-07-14 07:25:33 +00:00
if ((ret = ff_draw_slice(outlink, 0, picref->video->h, 1)) < 0 ||
(ret = ff_end_frame(outlink)) < 0)
return ret;
return 0;
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
}
lavfi: convert input/ouput list compound literals to named objects A number of compilers, for example those from TI and IBM, choke on these initialisers. The current style is also quite ugly. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-24 13:14:01 +00:00
static const AVFilterPad avfilter_vf_drawtext_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer,
Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 13:41:56 +00:00
.start_frame = ff_null_start_frame,
lavfi: convert input/ouput list compound literals to named objects A number of compilers, for example those from TI and IBM, choke on these initialisers. The current style is also quite ugly. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-24 13:14:01 +00:00
.draw_slice = null_draw_slice,
.end_frame = end_frame,
.config_props = config_input,
.min_perms = AV_PERM_WRITE |
AV_PERM_READ,
},
{ NULL }
};
static const AVFilterPad avfilter_vf_drawtext_outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
},
{ NULL }
};
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
AVFilter avfilter_vf_drawtext = {
.name = "drawtext",
.description = NULL_IF_CONFIG_SMALL("Draw text on top of video frames using libfreetype library."),
.priv_size = sizeof(DrawTextContext),
.init = init,
.uninit = uninit,
.query_formats = query_formats,
lavfi: convert input/ouput list compound literals to named objects A number of compilers, for example those from TI and IBM, choke on these initialisers. The current style is also quite ugly. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-24 13:14:01 +00:00
.inputs = avfilter_vf_drawtext_inputs,
.outputs = avfilter_vf_drawtext_outputs,
drawtext: Support changing parameters through reinit command at runtime. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-28 18:47:33 +00:00
.process_command = command,
lavfi: add priv class to filter definitions and flags to filter internal options This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-13 11:40:01 +00:00
.priv_class = &drawtext_class,
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-02-21 00:02:29 +00:00
};
Reference in New Issue Copy Permalink