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

options: remove --subfont-autoscale (changes default font scale)

Browse Source 
The code for this option attempted to emulate the old as-documented
behavior. It wasn't very good at it, and now that the old OSD code has
been removed, it's entirely pointless.

This removes the factor 1.7 with which --subfont-text-scale was
multiplied.
This commit is contained in:
wm4 2012-10-23 21:23:53 +02:00
parent 2afd7ebb4e
commit a8824f12dd
6 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DOCS/man/en/options.rst
View File

@ -1900,18 +1900,6 @@
Sets the subtitle font (see ``--font``). If no ``--subfont`` is given,
``--font`` is used for subtitles too.
--subfont-autoscale=<0-3>
Sets the autoscale mode.
*NOTE*: 0 means that text scale and OSD scale are font heights in points.
The mode can be:
:0: no autoscale
:1: proportional to movie height
:2: proportional to movie width
:3: proportional to movie diagonal (default)
--subfont-text-scale=<0-100>
Sets the subtitle text autoscale coefficient as percentage of the screen
size (default: 3.5).

1
cfg-mplayer.h
View File

@ -529,7 +529,6 @@ const m_option_t common_opts[] = {
{"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL},
{"sub-pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
{"subfont-text-scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
{"subfont-autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
OPT_MAKE_FLAGS("ass", ass_enabled, 0),
OPT_FLOATRANGE("ass-font-scale", ass_font_scale, 0, 0, 100),
OPT_FLOATRANGE("ass-line-spacing", ass_line_spacing, 0, -1000, 1000),

11
sub/ass_mp.c
View File

@ -61,17 +61,6 @@ ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts)
style->treat_fontname_as_pattern = 1;
double fs = track->PlayResY * text_font_scale_factor / 100.;
/* The font size is always proportional to video height only;
* real -subfont-autoscale behavior is not implemented.
* Apply a correction that corresponds to about 4:3 aspect ratio
* video to get a size somewhat closer to what non-libass rendering
* would produce with the same text_font_scale_factor
* and subtitle_autoscale.
*/
if (subtitle_autoscale == 2)
fs *= 1.3;
else if (subtitle_autoscale == 3)
fs *= 1.7;
uint32_t c1 = 0xFFFFFF00;
uint32_t c2 = 0x00000000;

14
sub/osd_libass.c
View File

@ -65,19 +65,7 @@ static void update_font_style(ASS_Track *track, ASS_Style *style, double factor)
style->Encoding = -1;
// duplicated from ass_mp.c
double fs = track->PlayResY * factor / 100.;
/* The font size is always proportional to video height only;
* real -subfont-autoscale behavior is not implemented.
* Apply a correction that corresponds to about 4:3 aspect ratio
* video to get a size somewhat closer to what non-libass rendering
* would produce with the same text_font_scale_factor
* and subtitle_autoscale.
*/
if (subtitle_autoscale == 2)
fs *= 1.3;
else if (subtitle_autoscale == 3)
fs *= 1.7;
style->FontSize = fs;
style->FontSize = track->PlayResY * factor / 100.;
style->Outline = style->FontSize / 16;
}

7
sub/sub.c
View File

@ -64,12 +64,7 @@ int sub_pos=100;
int sub_visibility=1;
subtitle* vo_sub=NULL;
float text_font_scale_factor = 3.5;
// 0 = no autoscale
// 1 = video height
// 2 = video width
// 3 = diagonal
int subtitle_autoscale = 3;
float text_font_scale_factor = 6;
char *font_name = NULL;
char *sub_font_name = NULL;

1
sub/sub.h
View File

@ -182,7 +182,6 @@ extern char *sub_cp;
extern int sub_pos;
extern float text_font_scale_factor;
extern int subtitle_autoscale;
extern char *font_name;
extern char *sub_font_name;