summaryrefslogtreecommitdiffstats
path: root/sub/dec_sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-06 21:55:37 +0200
committerwm4 <wm4@nowhere>2015-07-06 21:55:37 +0200
commit385febe27632075160c903a22502fcb78b160ae4 (patch)
tree8b9019f75492b42c22000558a9507294095eb1e5 /sub/dec_sub.c
parentdcd167ca37fcb14719f97ca637ec5f3efc3952d8 (diff)
downloadmpv-385febe27632075160c903a22502fcb78b160ae4.tar.bz2
mpv-385febe27632075160c903a22502fcb78b160ae4.tar.xz
sub: protect ASS_Renderer state
Each subtitle track gets its own decoder instance (sd_ass). But they use a shared ASS_Renderer. This is done mainly because of fontconfig. Initializing fontconfig is very slow when using it with memory fonts, so there's a practical need to cache this memory font state, which is done by not creating separate ASS_Renderers. This is very dirty and very evil, but we probably can't get rid of it any time soon. The shared ASS_Renderer was not properly synchronized. While the program logic guarantees that only one sd_ass instance is visible at a time, there are other interactions that require synchronization. In particular, I suspect concurrent execution of mp_ass_configure_fonts() and sd_ass.get_bitmaps cause issues in a newer libass development branch. So here's a shitty hack that hopefully fixes things, hopefully only until libass becomes less dependent on fontconfig.
Diffstat (limited to 'sub/dec_sub.c')
-rw-r--r--sub/dec_sub.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index f03526ca8b..c16f7b5887 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -156,11 +156,13 @@ void sub_set_extradata(struct dec_sub *sub, void *data, int data_len)
}
void sub_set_ass_renderer(struct dec_sub *sub, struct ass_library *ass_library,
- struct ass_renderer *ass_renderer)
+ struct ass_renderer *ass_renderer,
+ pthread_mutex_t *ass_lock)
{
pthread_mutex_lock(&sub->lock);
sub->init_sd.ass_library = ass_library;
sub->init_sd.ass_renderer = ass_renderer;
+ sub->init_sd.ass_lock = ass_lock;
pthread_mutex_unlock(&sub->lock);
}