mirror of https://github.com/mpv-player/mpv
Add -(no)ass-use-margins option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19569 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
89bf3d92e8
commit
432868f92c
|
@ -1703,7 +1703,7 @@ You may also want to use \-embeddedfonts.
|
||||||
.TP
|
.TP
|
||||||
.B \-ass-bottom-margin <value>
|
.B \-ass-bottom-margin <value>
|
||||||
Adds a black band at the bottom of the frame.
|
Adds a black band at the bottom of the frame.
|
||||||
The SSA/ASS renderer will place subtitles there.
|
The SSA/ASS renderer can place subtitles there (with -ass-use-margins).
|
||||||
.
|
.
|
||||||
.TP
|
.TP
|
||||||
.B \-ass-font-scale <value>
|
.B \-ass-font-scale <value>
|
||||||
|
@ -1727,7 +1727,12 @@ Set line spacing value for SSA/ASS renderer.
|
||||||
.TP
|
.TP
|
||||||
.B \-ass-top-margin <value>
|
.B \-ass-top-margin <value>
|
||||||
Adds a black band at the top of the frame.
|
Adds a black band at the top of the frame.
|
||||||
The SSA/ASS renderer will place toptitles there.
|
The SSA/ASS renderer can place toptitles there (with -ass-use-margins).
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
.B \-(no)ass-use-margins
|
||||||
|
Enables/disables placing toptitles and subtitles in black borders when they
|
||||||
|
are available (default: no).
|
||||||
.
|
.
|
||||||
.TP
|
.TP
|
||||||
.B \-dumpjacosub (MPlayer only)
|
.B \-dumpjacosub (MPlayer only)
|
||||||
|
|
|
@ -303,6 +303,8 @@
|
||||||
{"ass-line-spacing", &ass_line_spacing, CONF_TYPE_FLOAT, CONF_RANGE, -1000, 1000, NULL},
|
{"ass-line-spacing", &ass_line_spacing, CONF_TYPE_FLOAT, CONF_RANGE, -1000, 1000, NULL},
|
||||||
{"ass-top-margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
|
{"ass-top-margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
|
||||||
{"ass-bottom-margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
|
{"ass-bottom-margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
|
||||||
|
{"ass-use-margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL},
|
||||||
|
{"noass-use-margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 1, 0, NULL},
|
||||||
{"embeddedfonts", &extract_embedded_fonts, CONF_TYPE_FLAG, 0, 0, 1, NULL},
|
{"embeddedfonts", &extract_embedded_fonts, CONF_TYPE_FLAG, 0, 0, 1, NULL},
|
||||||
{"noembeddedfonts", &extract_embedded_fonts, CONF_TYPE_FLAG, 0, 1, 0, NULL},
|
{"noembeddedfonts", &extract_embedded_fonts, CONF_TYPE_FLAG, 0, 1, 0, NULL},
|
||||||
{"ass-force-style", &ass_force_style_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
|
{"ass-force-style", &ass_force_style_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
|
||||||
|
|
|
@ -13,6 +13,7 @@ int ass_top_margin = 0;
|
||||||
int ass_bottom_margin = 0;
|
int ass_bottom_margin = 0;
|
||||||
int extract_embedded_fonts = 0;
|
int extract_embedded_fonts = 0;
|
||||||
char **ass_force_style_list = NULL;
|
char **ass_force_style_list = NULL;
|
||||||
|
int ass_use_margins = 0;
|
||||||
|
|
||||||
extern int font_fontconfig;
|
extern int font_fontconfig;
|
||||||
extern char* font_name;
|
extern char* font_name;
|
||||||
|
|
|
@ -10,6 +10,7 @@ extern int ass_top_margin;
|
||||||
extern int ass_bottom_margin;
|
extern int ass_bottom_margin;
|
||||||
extern int extract_embedded_fonts;
|
extern int extract_embedded_fonts;
|
||||||
extern char **ass_force_style_list;
|
extern char **ass_force_style_list;
|
||||||
|
extern int ass_use_margins;
|
||||||
|
|
||||||
ass_track_t* ass_read_subdata(sub_data* subdata, double fps);
|
ass_track_t* ass_read_subdata(sub_data* subdata, double fps);
|
||||||
|
|
||||||
|
|
|
@ -81,6 +81,7 @@ static int config(struct vf_instance_s* vf,
|
||||||
settings.line_spacing = ass_line_spacing;
|
settings.line_spacing = ass_line_spacing;
|
||||||
settings.top_margin = ass_top_margin;
|
settings.top_margin = ass_top_margin;
|
||||||
settings.bottom_margin = ass_bottom_margin;
|
settings.bottom_margin = ass_bottom_margin;
|
||||||
|
settings.use_margins = ass_use_margins;
|
||||||
settings.aspect = ((double)d_width) / d_height;
|
settings.aspect = ((double)d_width) / d_height;
|
||||||
|
|
||||||
ass_configure(vf->priv->ass_priv, &settings);
|
ass_configure(vf->priv->ass_priv, &settings);
|
||||||
|
|
Loading…
Reference in New Issue