RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

sub: fully update plaintext subtitle styles at runtime

Browse Source 
Update options like --sub-text-margin-y at runtime. These are somewhat
of a problem, because ass_set_selective_style_override() (intentionally)
does not override them. This should be fixed in libass (by providing
additional override modes), but for now this will do.

Also change the signature of mp_ass_configure(), so we can get access to
the track.

Additionally, drop the redundant setting of the style Alignment (it's
overwritten by mp_ass_set_style()).

See #1622 (again).
This commit is contained in:
wm4 2015-02-24 16:17:10 +01:00
parent 71cc322f13
commit dbc5d7b7db
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sub/ass_mp.c
View File

@ -93,7 +93,6 @@ void mp_ass_add_default_styles(ASS_Track *track, struct MPOpts *opts)
track->default_style = sid; track->default_style = sid;
ASS_Style *style = track->styles + sid; ASS_Style *style = track->styles + sid;
style->Name = strdup("Default"); style->Name = strdup("Default");
style->Alignment = 2;
mp_ass_set_style(style, track->PlayResY, opts->sub_text_style); mp_ass_set_style(style, track->PlayResY, opts->sub_text_style);
} }

18
sub/sd_ass.c
View File

@ -124,9 +124,13 @@ static void decode(struct sd *sd, struct demux_packet *packet)
event->Text = strdup(text); event->Text = strdup(text);
} }
static void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts, bool is_ass, static void configure_ass(struct sd *sd, struct mp_osd_res *dim)
struct mp_osd_res *dim)
{ {
struct sd_ass_priv *ctx = sd->priv;
struct MPOpts *opts = sd->opts;
ASS_Renderer *priv = sd->ass_renderer;
ASS_Track *track = ctx->ass_track;
ass_set_frame_size(priv, dim->w, dim->h); ass_set_frame_size(priv, dim->w, dim->h);
ass_set_margins(priv, dim->mt, dim->mb, dim->ml, dim->mr); ass_set_margins(priv, dim->mt, dim->mb, dim->ml, dim->mr);
@ -139,7 +143,7 @@ static void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts, bool is_as
bool set_scale_by_window = true; bool set_scale_by_window = true;
bool total_override = false; bool total_override = false;
// With forced overrides, apply the --sub-* specific options // With forced overrides, apply the --sub-* specific options
if (!is_ass || opts->ass_style_override == 3) { if (ctx->is_converted || opts->ass_style_override == 3) {
set_scale_with_window = opts->sub_scale_with_window; set_scale_with_window = opts->sub_scale_with_window;
set_use_margins = opts->sub_use_margins; set_use_margins = opts->sub_use_margins;
set_scale_by_window = opts->sub_scale_by_window; set_scale_by_window = opts->sub_scale_by_window;
@ -148,7 +152,7 @@ static void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts, bool is_as
set_scale_with_window = opts->ass_scale_with_window; set_scale_with_window = opts->ass_scale_with_window;
set_use_margins = opts->ass_use_margins; set_use_margins = opts->ass_use_margins;
} }
if (!is_ass || opts->ass_style_override) { if (ctx->is_converted || opts->ass_style_override) {
set_sub_pos = 100 - opts->sub_pos; set_sub_pos = 100 - opts->sub_pos;
set_line_spacing = opts->ass_line_spacing; set_line_spacing = opts->ass_line_spacing;
set_hinting = opts->ass_hinting; set_hinting = opts->ass_hinting;
@ -176,6 +180,10 @@ static void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts, bool is_as
mp_ass_set_style(&style, 288, opts->sub_text_style); mp_ass_set_style(&style, 288, opts->sub_text_style);
ass_set_selective_style_override(priv, &style); ass_set_selective_style_override(priv, &style);
free(style.FontName); free(style.FontName);
if (ctx->is_converted && track->default_style < track->n_styles) {
mp_ass_set_style(track->styles + track->default_style,
track->PlayResY, opts->sub_text_style);
}
ass_set_font_scale(priv, set_font_scale); ass_set_font_scale(priv, set_font_scale);
ass_set_hinting(priv, set_hinting); ass_set_hinting(priv, set_hinting);
ass_set_line_spacing(priv, set_line_spacing); ass_set_line_spacing(priv, set_line_spacing);
@ -202,7 +210,7 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts,
if (isnormal(par)) if (isnormal(par))
scale = par; scale = par;
} }
mp_ass_configure(renderer, opts, !ctx->is_converted, &dim); configure_ass(sd, &dim);
ass_set_aspect_ratio(renderer, scale, 1); ass_set_aspect_ratio(renderer, scale, 1);
if (!ctx->is_converted && (!opts->ass_style_override || if (!ctx->is_converted && (!opts->ass_style_override ||
opts->ass_vsfilter_blur_compat)) opts->ass_vsfilter_blur_compat))