RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 03:37:27 +00:00
Code Issues Releases Wiki Activity

Disable libass fallbacks for fontconfig < 2.4.2

Browse Source 
libass doesn't support fontconfig < 2.4.2 so fallbacks for these
ancient versions aren't needed anymore. Also update the man page
(English, German) to reflect the change. Additionally note that
-embeddedfonts controls the use of ASS script embedded fonts too.

-embeddedfonts is now always enabled by default. Fonts are never
extracted into a directory anymore but passed to libass via memory.
This commit is contained in:
Grigori Goronzy 2010-01-25 13:57:32 +01:00 committed by Uoti Urpala
parent e28e4a1b15
commit 42a87fc611
6 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DOCS/man/de/mplayer.1
View File

@ -2193,7 +2193,6 @@ Siehe auch \-vf expand.
Schaltet das Zeichnen von SSA/ASS-Untertiteln ein. Schaltet das Zeichnen von SSA/ASS-Untertiteln ein.
Mit dieser Option wird libass für externe SSA/ASS-Untertitel und Mit dieser Option wird libass für externe SSA/ASS-Untertitel und
Matroska-Spuren verwendet. Matroska-Spuren verwendet.
Du möchtest vielleicht auch \-embeddedfonts verwenden.
.br .br
.I ANMERKUNG: .I ANMERKUNG:
Wenn fontconfig eincompiliert wurde, schaltet \-ass automatisch \-fontconfig Wenn fontconfig eincompiliert wurde, schaltet \-ass automatisch \-fontconfig
@ -2320,17 +2319,10 @@ Speichert den Untertitel-Substream eines VOB-Streams.
Siehe auch die Optionen \-dump*sub und \-vobsubout*. Siehe auch die Optionen \-dump*sub und \-vobsubout*.
. .
.TP .TP
.B \-embeddedfonts (nur bei FreeType) .B \-noembeddedfonts
Aktiviert die Extraktion von in Matroska eingebetteten Schriften (Standard: Deaktiviert die Nutzung von in Matroska-Dateien und ASS-Untertiteln eingebetteten Schriften (Standard:
deaktiviert). aktiviert).
Diese Schriften können für das Rendern von SSA/ASS-Untertiteln verwendet werden Diese Schriften können für das Rendern von SSA/ASS-Untertiteln verwendet werden
(Option \-ass).
Schriftdateien werden im Verzeichnis ~/.mplayer/\:fonts angelegt.
.br
.I ANMERKUNG:
Bei der Verwendung von FontConfig 2.4.2 oder neuer werden eingebettete
Schriften direkt vom Speicher geöffnet; diese Option ist per Voreinstellung
aktiviert.
. .
.TP .TP
.B \-ffactor <Nummer> .B \-ffactor <Nummer>

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

@ -2072,7 +2072,6 @@ Also see \-vf expand.
Turn on SSA/ASS subtitle rendering. Turn on SSA/ASS subtitle rendering.
With this option, libass will be used for SSA/ASS With this option, libass will be used for SSA/ASS
external subtitles and Matroska tracks. external subtitles and Matroska tracks.
You may also want to use \-embeddedfonts.
.br .br
.I NOTE: .I NOTE:
Unlike normal OSD, libass uses fontconfig by default. To disable it, use Unlike normal OSD, libass uses fontconfig by default. To disable it, use
@ -2197,15 +2196,10 @@ Dumps the subtitle substream from VOB streams.
Also see the \-dump*sub and \-vobsubout* options. Also see the \-dump*sub and \-vobsubout* options.
. .
.TP .TP
.B \-embeddedfonts (FreeType only) .B \-noembeddedfonts
Enables extraction of Matroska embedded fonts (default: disabled). Disables use of fonts embedded in Matroska containers and ASS scripts (default: enabled).
These fonts can be used for SSA/ASS subtitle These fonts can be used for SSA/ASS subtitle
rendering (\-ass option). rendering (\-ass option).
Font files are created in the ~/.mplayer/\:fonts directory.
.br
.I NOTE:
With FontConfig 2.4.2 or newer, embedded fonts are opened directly from memory,
and this option is enabled by default.
. .
.TP .TP
.B \-ffactor <number> .B \-ffactor <number>

8
ass_mp.c
View File

@ -41,11 +41,7 @@ float ass_font_scale = 1.;
float ass_line_spacing = 0.; float ass_line_spacing = 0.;
int ass_top_margin = 0; int ass_top_margin = 0;
int ass_bottom_margin = 0; int ass_bottom_margin = 0;
#if defined(FC_VERSION) && (FC_VERSION >= 20402) int use_embedded_fonts = 1;
int extract_embedded_fonts = 1;
#else
int extract_embedded_fonts = 0;
#endif
char **ass_force_style_list = NULL; char **ass_force_style_list = NULL;
int ass_use_margins = 0; int ass_use_margins = 0;
char *ass_color = NULL; char *ass_color = NULL;
@ -285,7 +281,7 @@ ASS_Library *ass_init(void)
priv = ass_library_init(); priv = ass_library_init();
ass_set_message_cb(priv, message_callback, NULL); ass_set_message_cb(priv, message_callback, NULL);
ass_set_fonts_dir(priv, path); ass_set_fonts_dir(priv, path);
ass_set_extract_fonts(priv, extract_embedded_fonts); ass_set_extract_fonts(priv, use_embedded_fonts);
ass_set_style_overrides(priv, ass_force_style_list); ass_set_style_overrides(priv, ass_force_style_list);
free(path); free(path);
return priv; return priv;

2
ass_mp.h
View File

@ -36,7 +36,7 @@ extern float ass_font_scale;
extern float ass_line_spacing; extern float ass_line_spacing;
extern int ass_top_margin; extern int ass_top_margin;
extern int ass_bottom_margin; extern int ass_bottom_margin;
extern int extract_embedded_fonts; extern int use_embedded_fonts;
extern char **ass_force_style_list; extern char **ass_force_style_list;
extern int ass_use_margins; extern int ass_use_margins;
extern char *ass_color; extern char *ass_color;

4
cfg-common-opts.h
View File

@ -329,8 +329,8 @@
{"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}, {"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}, {"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", &use_embedded_fonts, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noembeddedfonts", &extract_embedded_fonts, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"noembeddedfonts", &use_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},
{"ass-color", &ass_color, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ass-color", &ass_color, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"ass-border-color", &ass_border_color, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ass-border-color", &ass_border_color, CONF_TYPE_STRING, 0, 0, 0, NULL},

2
mplayer.c
View File

@ -3670,7 +3670,7 @@ if (opts->ass_enabled && ass_library) {
struct demuxer *d = mpctx->sources[j].demuxer; struct demuxer *d = mpctx->sources[j].demuxer;
for (int i = 0; i < d->num_attachments; i++) { for (int i = 0; i < d->num_attachments; i++) {
struct demux_attachment *att = d->attachments + i; struct demux_attachment *att = d->attachments + i;
if (extract_embedded_fonts if (use_embedded_fonts
&& att->name && att->type && att->data && att->data_size && att->name && att->type && att->data && att->data_size
&& (strcmp(att->type, "application/x-truetype-font") == 0 && (strcmp(att->type, "application/x-truetype-font") == 0
|| strcmp(att->type, "application/x-font") == 0)) || strcmp(att->type, "application/x-font") == 0))