highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_subtitles: allow setting fonts directory

Browse Source 
This is mostly useful if libass was compiled with a font provider
other than fontconfig, but is still useful in that case.

Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
This commit is contained in:
Ricardo Constantino 2015-08-30 23:52:10 +01:00 committed by wm4
parent 642d2f9d55
commit 9dbc50b4cd
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -9939,6 +9939,10 @@ was composed. For the syntax of this option, check the
Due to a misdesign in ASS aspect ratio arithmetic, this is necessary to Due to a misdesign in ASS aspect ratio arithmetic, this is necessary to
correctly scale the fonts if the aspect ratio has been changed. correctly scale the fonts if the aspect ratio has been changed.
@item fontsdir
Set a directory path containing fonts that can be used by the filter.
These fonts will be used in addition to whatever the font provider uses.
@item charenc @item charenc
Set subtitles input character encoding. @code{subtitles} filter only. Only Set subtitles input character encoding. @code{subtitles} filter only. Only
useful if not UTF-8. useful if not UTF-8.

4
libavfilter/vf_subtitles.c
View File

@ -50,6 +50,7 @@ typedef struct {
ASS_Renderer *renderer; ASS_Renderer *renderer;
ASS_Track *track; ASS_Track *track;
char *filename; char *filename;
char *fontsdir;
char *charenc; char *charenc;
char *force_style; char *force_style;
int stream_index; int stream_index;
@ -67,6 +68,7 @@ typedef struct {
{"filename", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \ {"filename", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
{"f", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \ {"f", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
{"original_size", "set the size of the original video (used to scale fonts)", OFFSET(original_w), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \ {"original_size", "set the size of the original video (used to scale fonts)", OFFSET(original_w), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
{"fontsdir", "set the directory containing the fonts to read", OFFSET(fontsdir), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
/* libass supports a log level ranging from 0 to 7 */ /* libass supports a log level ranging from 0 to 7 */
static const int ass_libavfilter_log_level_map[] = { static const int ass_libavfilter_log_level_map[] = {
@ -106,6 +108,8 @@ static av_cold int init(AVFilterContext *ctx)
} }
ass_set_message_cb(ass->library, ass_log, ctx); ass_set_message_cb(ass->library, ass_log, ctx);
ass_set_fonts_dir(ass->library, ass->fontsdir);
ass->renderer = ass_renderer_init(ass->library); ass->renderer = ass_renderer_init(ass->library);
if (!ass->renderer) { if (!ass->renderer) {
av_log(ctx, AV_LOG_ERROR, "Could not initialize libass renderer.\n"); av_log(ctx, AV_LOG_ERROR, "Could not initialize libass renderer.\n");