From 385febe27632075160c903a22502fcb78b160ae4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 6 Jul 2015 21:55:37 +0200 Subject: 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. --- sub/dec_sub.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sub/dec_sub.h') diff --git a/sub/dec_sub.h b/sub/dec_sub.h index 495ac46402..ddec46e243 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -3,6 +3,7 @@ #include #include +#include #include "osd.h" @@ -31,7 +32,8 @@ void sub_set_video_res(struct dec_sub *sub, int w, int h); void sub_set_video_fps(struct dec_sub *sub, double fps); 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); void sub_init_from_sh(struct dec_sub *sub, struct sh_stream *sh); bool sub_is_initialized(struct dec_sub *sub); -- cgit v1.2.3