RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
eugeni 2006-08-28 15:12:45 +00:00
parent 89bf3d92e8
commit 432868f92c
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DOCS/man/en/mplayer.1
View File

@ -1703,7 +1703,7 @@ You may also want to use \-embeddedfonts.
.TP
.B \-ass-bottom-margin <value>
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
.B \-ass-font-scale <value>
@ -1727,7 +1727,12 @@ Set line spacing value for SSA/ASS renderer.
.TP
.B \-ass-top-margin <value>
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
.B \-dumpjacosub (MPlayer only)

2
cfg-common.h
View File

@ -303,6 +303,8 @@
{"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-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},
{"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},

1
libass/ass_mp.c
View File

@ -13,6 +13,7 @@ int ass_top_margin = 0;
int ass_bottom_margin = 0;
int extract_embedded_fonts = 0;
char **ass_force_style_list = NULL;
int ass_use_margins = 0;
extern int font_fontconfig;
extern char* font_name;

1
libass/ass_mp.h
View File

@ -10,6 +10,7 @@ extern int ass_top_margin;
extern int ass_bottom_margin;
extern int extract_embedded_fonts;
extern char **ass_force_style_list;
extern int ass_use_margins;
ass_track_t* ass_read_subdata(sub_data* subdata, double fps);

1
libmpcodecs/vf_ass.c
View File

@ -81,6 +81,7 @@ static int config(struct vf_instance_s* vf,
settings.line_spacing = ass_line_spacing;
settings.top_margin = ass_top_margin;
settings.bottom_margin = ass_bottom_margin;
settings.use_margins = ass_use_margins;
settings.aspect = ((double)d_width) / d_height;
ass_configure(vf->priv->ass_priv, &settings);