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

osd: always reset style params

Browse Source 
There was some logic to set certain things on init only. Not sure why
this was done (saving some cheap calculations?) - but since the next
call would override these style settings by applying the usual subtitle
style, I don't think this was intended.
This commit is contained in:
wm4 2015-02-24 14:36:14 +01:00
parent cc011415ff
commit 9fbcb56bee
1 changed files with 8 additions and 11 deletions

19
sub/osd_libass.c
View File

@ -301,7 +301,6 @@ static void get_osd_bar_box(struct osd_state *osd, struct osd_object *obj,
{ {
struct MPOpts *opts = osd->opts; struct MPOpts *opts = osd->opts;
bool new_track = !obj->osd_track;
create_ass_track(osd, obj, 0, 0); create_ass_track(osd, obj, 0, 0);
ASS_Track *track = obj->osd_track; ASS_Track *track = obj->osd_track;
ASS_Style *style = track->styles + track->default_style; ASS_Style *style = track->styles + track->default_style;
@ -309,16 +308,14 @@ static void get_osd_bar_box(struct osd_state *osd, struct osd_object *obj,
*o_w = track->PlayResX * (opts->osd_bar_w / 100.0); *o_w = track->PlayResX * (opts->osd_bar_w / 100.0);
*o_h = track->PlayResY * (opts->osd_bar_h / 100.0); *o_h = track->PlayResY * (opts->osd_bar_h / 100.0);
if (new_track) { float base_size = 0.03125;
float base_size = 0.03125; style->Outline *= *o_h / track->PlayResY / base_size;
style->Outline *= *o_h / track->PlayResY / base_size; // So that the chapter marks have space between them
// So that the chapter marks have space between them style->Outline = FFMIN(style->Outline, *o_h / 5.2);
style->Outline = FFMIN(style->Outline, *o_h / 5.2); // So that the border is not 0
// So that the border is not 0 style->Outline = FFMAX(style->Outline, *o_h / 32.0);
style->Outline = FFMAX(style->Outline, *o_h / 32.0); // Rendering with shadow is broken (because there's more than one shape)
// Rendering with shadow is broken (because there's more than one shape) style->Shadow = 0;
style->Shadow = 0;
}
*o_border = style->Outline; *o_border = style->Outline;