From a2fce5ba26dbab4836df4cb75a1458ca41f0dcb6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 8 Sep 2016 18:53:20 +0200 Subject: vo: don't access global options unsynchronized And since there's no proper fine-grained option change notification mechanism yet, intercept updates to "framedrop" manually. --- video/out/vo.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'video') diff --git a/video/out/vo.c b/video/out/vo.c index afd4b4c792..2ad57eff7f 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -156,6 +156,7 @@ struct vo_internal { int req_frames; // VO's requested value of num_frames double display_fps; + int opt_framedrop; }; static void forget_frames(struct vo *vo); @@ -458,12 +459,15 @@ static void update_display_fps(struct vo *vo) pthread_mutex_unlock(&in->lock); - double display_fps = 0; - if (vo->global->opts->frame_drop_fps > 0) { - display_fps = vo->global->opts->frame_drop_fps; - } else { + mp_read_option_raw(vo->global, "framedrop", &m_option_type_choice, + &in->opt_framedrop); + + double display_fps; + mp_read_option_raw(vo->global, "display-fps", &m_option_type_double, + &display_fps); + + if (display_fps <= 0) vo->driver->control(vo, VOCTRL_GET_DISPLAY_FPS, &display_fps); - } pthread_mutex_lock(&in->lock); @@ -763,7 +767,7 @@ static bool render_frame(struct vo *vo) in->dropped_frame &= !frame->display_synced; in->dropped_frame &= !(vo->driver->caps & VO_CAP_FRAMEDROP); - in->dropped_frame &= (vo->global->opts->frame_dropping & 1); + in->dropped_frame &= (in->opt_framedrop & 1); // Even if we're hopelessly behind, rather degrade to 10 FPS playback, // instead of just freezing the display forever. in->dropped_frame &= now - in->prev_vsync < 100 * 1000; -- cgit v1.2.3