diff options
author | wm4 <wm4@nowhere> | 2015-03-10 14:05:42 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-03-10 14:16:07 +0100 |
commit | eff265c1400f6795e284d4e7c9054cf288d6c0cf (patch) | |
tree | 23da5356d33da8453222baf85e40e9d52023f7e3 /video/out/vo_opengl_cb.c | |
parent | 2f5e31cf47d8b340989395d84d966d1d1390fe3f (diff) | |
download | mpv-eff265c1400f6795e284d4e7c9054cf288d6c0cf.tar.bz2 mpv-eff265c1400f6795e284d4e7c9054cf288d6c0cf.tar.xz |
vo_opengl_cb: clear last video frame on uninit()
mpv_opengl_cb_render() is supposed to clear the screen with the
background color if there's no video... I think.
It didn't do this, because although uninit() requested gl_video_config()
to be called, this didn't happen, because this function checks whether
the VO is set - and it's unsert after uninit() releases the lock.
Also call the user wakeup callback in this situation, so the user
actually redraws immediately.
Diffstat (limited to 'video/out/vo_opengl_cb.c')
-rw-r--r-- | video/out/vo_opengl_cb.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c index 7334d31add..cd04f5219b 100644 --- a/video/out/vo_opengl_cb.c +++ b/video/out/vo_opengl_cb.c @@ -306,20 +306,20 @@ int mpv_opengl_cb_render(struct mpv_opengl_cb_context *ctx, int fbo, int vp[4]) gl_video_resize(ctx->renderer, &wnd, &src, &dst, &osd, !ctx->flip); } - if (vo) { - struct vo_priv *p = vo->priv; - if (ctx->reconfigured) - gl_video_config(ctx->renderer, &ctx->img_params); - if (ctx->reconfigured || ctx->update_new_opts) { - struct vo_priv *opts = p->ctx->new_opts ? p->ctx->new_opts : p; + if (ctx->reconfigured) + gl_video_config(ctx->renderer, &ctx->img_params); + if (ctx->update_new_opts) { + struct vo_priv *p = vo ? vo->priv : NULL; + struct vo_priv *opts = ctx->new_opts ? ctx->new_opts : p; + if (opts) { gl_video_set_options(ctx->renderer, opts->renderer_opts); 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); } - ctx->reconfigured = false; - ctx->update_new_opts = false; } + ctx->reconfigured = false; + ctx->update_new_opts = false; struct mp_csp_equalizer *eq = gl_video_eq_ptr(ctx->renderer); if (ctx->eq_changed) { @@ -507,6 +507,7 @@ static void uninit(struct vo *vo) p->ctx->img_params = (struct mp_image_params){0}; p->ctx->reconfigured = true; p->ctx->active = NULL; + update(p); pthread_mutex_unlock(&p->ctx->lock); } |