aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEejya Singh <singh.eejya@gmail.com>2015-01-28 17:41:42 +0530
committerClément Bœsch <u@pkh.me>2015-02-08 11:36:49 +0100
commit40b198e98736819f647f794e57517d1b42e85791 (patch)
tree85a759c8797a0b5845c7ff0ac819621b844f097f
parent5ae140c04f027da708859bb046e032a593fd81ad (diff)
downloadffmpeg-40b198e98736819f647f794e57517d1b42e85791.tar.gz
lavfi/subtitles: add force_style option
Signed-off-by: Eejya Singh <singh.eejya@gmail.com> Signed-off-by: Clément Bœsch <u@pkh.me>
-rw-r--r--doc/filters.texi10
-rw-r--r--libavfilter/version.h2
-rw-r--r--libavfilter/vf_subtitles.c23
3 files changed, 34 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index c6fef0c16c..a90825aa98 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -8554,6 +8554,10 @@ useful if not UTF-8.
@item stream_index, si
Set subtitles stream index. @code{subtitles} filter only.
+
+@item force_style
+Override default style or script info parameters of the subtitles. It accepts a
+string containing ASS style format @code{KEY=VALUE} couples separated by ",".
@end table
If the first key is not specified, it is assumed that the first value
@@ -8580,6 +8584,12 @@ To render the second subtitles stream from that file, use:
subtitles=video.mkv:si=1
@end example
+To make the subtitles stream from @file{sub.srt} appear in transparent green
+@code{DejaVu Serif}, use:
+@example
+subtitles=sub.srt:force_style='FontName=DejaVu Serif,PrimaryColour=&HAA00FF00'
+@end example
+
@section super2xsai
Scale the input by 2x and smooth using the Super2xSaI (Scale and
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 78863afb6c..49ea3a90da 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 5
#define LIBAVFILTER_VERSION_MINOR 9
-#define LIBAVFILTER_VERSION_MICRO 103
+#define LIBAVFILTER_VERSION_MICRO 104
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index be4c6a534d..f7fc1a6707 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -51,6 +51,7 @@ typedef struct {
ASS_Track *track;
char *filename;
char *charenc;
+ char *force_style;
int stream_index;
uint8_t rgba_map[4];
int pix_step[4]; ///< steps per pixel for each plane of the main output
@@ -260,6 +261,7 @@ static const AVOption subtitles_options[] = {
{"charenc", "set input character encoding", OFFSET(charenc), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS},
{"stream_index", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS},
{"si", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS},
+ {"force_style", "force subtitle style", OFFSET(force_style), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS},
{NULL},
};
@@ -392,6 +394,27 @@ static av_cold int init_subtitles(AVFilterContext *ctx)
if (ret < 0)
goto end;
+ if (ass->force_style) {
+ char **list = NULL;
+ char *temp = NULL;
+ char *ptr = av_strtok(ass->force_style, ",", &temp);
+ int i = 0;
+ while (ptr) {
+ av_dynarray_add(&list, &i, ptr);
+ if (!list) {
+ ret = AVERROR(ENOMEM);
+ goto end;
+ }
+ ptr = av_strtok(NULL, ",", &temp);
+ }
+ av_dynarray_add(&list, &i, NULL);
+ if (!list) {
+ ret = AVERROR(ENOMEM);
+ goto end;
+ }
+ ass_set_style_overrides(ass->library, list);
+ av_free(list);
+ }
/* Decode subtitles and push them into the renderer (libass) */
if (dec_ctx->subtitle_header)
ass_process_codec_private(ass->track,