From 03e062d53e3822591d0265a1062161a87e2795c1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 1 Jul 2015 19:24:57 +0200 Subject: vo_opengl_cb: fix interpolation code path --- video/out/vo_opengl_cb.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c index c1a8748f4e..7cd44c2c29 100644 --- a/video/out/vo_opengl_cb.c +++ b/video/out/vo_opengl_cb.c @@ -82,7 +82,6 @@ struct mpv_opengl_cb_context { struct mp_csp_equalizer eq; int64_t recent_flip; int64_t approx_vsync; - bool vsync_timed; // --- All of these can only be accessed from the thread where the host // application's OpenGL context is current - i.e. only while the @@ -338,10 +337,7 @@ int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int vp_w, int vp_h) if (opts) { int queue = 0; gl_video_set_options(ctx->renderer, opts->renderer_opts, &queue); - ctx->vsync_timed = opts->renderer_opts->interpolation; - if (ctx->vsync_timed) - queue += 0.050 * 1e6; // disable video timing - vo_set_queue_params(vo, queue, false, 0); + vo_set_queue_params(vo, 0, opts->renderer_opts->interpolation, queue); ctx->gl->debug_context = opts->use_gl_debug; gl_video_set_debug(ctx->renderer, opts->use_gl_debug); frame_queue_shrink(ctx, opts->frame_queue_size); @@ -385,7 +381,7 @@ int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int vp_w, int vp_h) pthread_mutex_lock(&ctx->lock); const int left = ctx->queued_frames; - if (vo && (left > 0 || ctx->vsync_timed)) + if (vo && left > 0) update(vo->priv); pthread_mutex_unlock(&ctx->lock); -- cgit v1.2.3