From 92a9f11a0b4fda60c8880014be5920dcf3e95253 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 17 Jan 2014 23:13:09 +0100 Subject: sub: uglify sub decoder with locking The plan is to make the whole OSD thread-safe, and we start with this. We just put locks on all entry points (fortunately, dec_sub.c and all sd_*.c decoders are very closed off, and only the entry points in dec_sub.h let you access it). I think this is pretty ugly, but at least it's very simple. There's a special case with sub_get_bitmaps(): this function returns pointers to decoder data (specifically, libass images). There's no way to synchronize this internally, so expose sub_lock/sub_unlock functions. To make things simpler, and especially because the lock is sort-of exposed to the outside world, make the locks recursive. Although the only case where this is actually needed (although trivial) is sub_set_extradata(). One corner case are ASS subtitles: for some reason, we keep a single ASS_Renderer instance for subtitles around (probably to avoid rescanning fonts with ordered chapters), and this ASS_Renderer instance is not synchronized. Also, demux_libass.c loads ASS_Track objects, which are directly passed to sd_ass.c. These things are not synchronized (and would be hard to synchronize), and basically we're out of luck. But I think for now, accesses happen reasonably serialized, so there is no actual problem yet, even if we start to access OSD from other threads. --- sub/dec_sub.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sub/dec_sub.h') diff --git a/sub/dec_sub.h b/sub/dec_sub.h index c659458c04..495ac46402 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -24,6 +24,8 @@ enum sd_ctrl { struct dec_sub *sub_create(struct mpv_global *global); void sub_destroy(struct dec_sub *sub); +void sub_lock(struct dec_sub *sub); +void sub_unlock(struct dec_sub *sub); void sub_set_video_res(struct dec_sub *sub, int w, int h); void sub_set_video_fps(struct dec_sub *sub, double fps); -- cgit v1.2.3