summaryrefslogtreecommitdiffstats
path: root/sub/sd_ass.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-26 18:34:18 +0100
committerwm4 <wm4@nowhere>2015-12-26 18:34:18 +0100
commit8d4a179c144cb3e36762b2c3cef55d1d3bb9f951 (patch)
tree324adbf40a378eff49bad45dfdc56dbf2bf4972c /sub/sd_ass.c
parentce8524cb479f3b3339c6d2b3e0f5a45051145204 (diff)
downloadmpv-8d4a179c144cb3e36762b2c3cef55d1d3bb9f951.tar.bz2
mpv-8d4a179c144cb3e36762b2c3cef55d1d3bb9f951.tar.xz
sub: always recreate ASS_Renderer on subtitle decoder reinit
This includes the case of switching ordered chapter boundaries. It will now be recreated on each timeline part switch. This shouldn't be much of a problem with modern libass. (Older libass versions use fontconfig for memory fonts, and will be very slow to reinitialize memory fonts.)
Diffstat (limited to 'sub/sd_ass.c')
-rw-r--r--sub/sd_ass.c83
1 files changed, 67 insertions, 16 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 16275207b7..5a6be1bf1b 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -29,7 +29,7 @@
#include "options/options.h"
#include "common/common.h"
#include "common/msg.h"
-#include "demux/stheader.h"
+#include "demux/demux.h"
#include "video/csputils.h"
#include "video/mp_image.h"
#include "dec_sub.h"
@@ -37,6 +37,8 @@
#include "sd.h"
struct sd_ass_priv {
+ struct ass_library *ass_library;
+ struct ass_renderer *ass_renderer;
struct ass_track *ass_track;
struct ass_track *shadow_track; // for --sub-ass=no rendering
bool is_converted;
@@ -78,6 +80,51 @@ static void mp_ass_add_default_styles(ASS_Track *track, struct MPOpts *opts)
ass_process_force_style(track);
}
+static const char *const font_mimetypes[] = {
+ "application/x-truetype-font",
+ "application/vnd.ms-opentype",
+ "application/x-font-ttf",
+ "application/x-font", // probably incorrect
+ NULL
+};
+
+static const char *const font_exts[] = {".ttf", ".ttc", ".otf", NULL};
+
+static bool attachment_is_font(struct mp_log *log, struct demux_attachment *f)
+{
+ if (!f->name || !f->type || !f->data || !f->data_size)
+ return false;
+ for (int n = 0; font_mimetypes[n]; n++) {
+ if (strcmp(font_mimetypes[n], f->type) == 0)
+ return true;
+ }
+ // fallback: match against file extension
+ char *ext = strlen(f->name) > 4 ? f->name + strlen(f->name) - 4 : "";
+ for (int n = 0; font_exts[n]; n++) {
+ if (strcasecmp(ext, font_exts[n]) == 0) {
+ mp_warn(log, "Loading font attachment '%s' with MIME type %s. "
+ "Assuming this is a broken Matroska file, which was "
+ "muxed without setting a correct font MIME type.\n",
+ f->name, f->type);
+ return true;
+ }
+ }
+ return false;
+}
+
+static void add_subtitle_fonts(struct sd *sd)
+{
+ struct sd_ass_priv *ctx = sd->priv;
+ struct MPOpts *opts = sd->opts;
+ if (!opts->ass_enabled || !sd->demuxer)
+ return;
+ for (int i = 0; i < sd->demuxer->num_attachments; i++) {
+ struct demux_attachment *f = &sd->demuxer->attachments[i];
+ if (opts->use_embedded_fonts && attachment_is_font(sd->log, f))
+ ass_add_font(ctx->ass_library, f->name, f->data, f->data_size);
+ }
+}
+
static bool supports_format(const char *format)
{
return (format && strcmp(format, "ass") == 0) ||
@@ -87,9 +134,6 @@ static bool supports_format(const char *format)
static int init(struct sd *sd)
{
struct MPOpts *opts = sd->opts;
- if (!sd->ass_library || !sd->ass_renderer || !sd->ass_lock)
- return -1;
-
struct sd_ass_priv *ctx = talloc_zero(sd, struct sd_ass_priv);
sd->priv = ctx;
@@ -106,13 +150,23 @@ static int init(struct sd *sd)
extradata_size = extradata ? strlen(extradata) : 0;
}
- pthread_mutex_lock(sd->ass_lock);
+ ctx->ass_library = mp_ass_init(sd->global, sd->log);
+
+ add_subtitle_fonts(sd);
+
+ if (opts->ass_style_override)
+ ass_set_style_overrides(ctx->ass_library, opts->ass_force_style_list);
- ctx->ass_track = ass_new_track(sd->ass_library);
+ ctx->ass_renderer = ass_renderer_init(ctx->ass_library);
+
+ mp_ass_configure_fonts(ctx->ass_renderer, opts->sub_text_style,
+ sd->global, sd->log);
+
+ ctx->ass_track = ass_new_track(ctx->ass_library);
if (!ctx->is_converted)
ctx->ass_track->track_type = TRACK_TYPE_ASS;
- ctx->shadow_track = ass_new_track(sd->ass_library);
+ ctx->shadow_track = ass_new_track(ctx->ass_library);
ctx->shadow_track->PlayResX = 384;
ctx->shadow_track->PlayResY = 288;
mp_ass_add_default_styles(ctx->shadow_track, opts);
@@ -122,8 +176,6 @@ static int init(struct sd *sd)
mp_ass_add_default_styles(ctx->ass_track, opts);
- pthread_mutex_unlock(sd->ass_lock);
-
ctx->sub_speed = 1.0;
if (sd->video_fps && sd->sh && sd->sh->sub->frame_based > 0) {
@@ -186,7 +238,8 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
bool converted, ASS_Track *track)
{
struct MPOpts *opts = sd->opts;
- ASS_Renderer *priv = sd->ass_renderer;
+ struct sd_ass_priv *ctx = sd->priv;
+ ASS_Renderer *priv = ctx->ass_renderer;
ass_set_frame_size(priv, dim->w, dim->h);
ass_set_margins(priv, dim->mt, dim->mb, dim->ml, dim->mr);
@@ -332,12 +385,10 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts,
bool converted = ctx->is_converted || no_ass;
ASS_Track *track = no_ass ? ctx->shadow_track : ctx->ass_track;
- if (pts == MP_NOPTS_VALUE || !sd->ass_renderer)
+ if (pts == MP_NOPTS_VALUE)
return;
- pthread_mutex_lock(sd->ass_lock);
-
- ASS_Renderer *renderer = sd->ass_renderer;
+ ASS_Renderer *renderer = ctx->ass_renderer;
double scale = dim.display_par;
if (!converted && (!opts->ass_style_override ||
opts->ass_vsfilter_aspect_compat))
@@ -364,8 +415,6 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts,
if (!converted)
mangle_colors(sd, res);
-
- pthread_mutex_unlock(sd->ass_lock);
}
struct buf {
@@ -528,6 +577,8 @@ static void uninit(struct sd *sd)
if (ctx->converter)
lavc_conv_uninit(ctx->converter);
ass_free_track(ctx->ass_track);
+ ass_renderer_done(ctx->ass_renderer);
+ ass_library_done(ctx->ass_library);
}
static int control(struct sd *sd, enum sd_ctrl cmd, void *arg)