summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-03 21:53:32 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-10-11 13:55:22 +0200
commit89df07aa6d9aac332b3f03fbc283e9d6c35d3e7e (patch)
treeb62eb36fd4d52f1e838533dd594233d2af357eef /player
parent04a8dd38d53f059a0e2b7d6a8c350a488bfb2a3f (diff)
downloadmpv-89df07aa6d9aac332b3f03fbc283e9d6c35d3e7e.tar.bz2
mpv-89df07aa6d9aac332b3f03fbc283e9d6c35d3e7e.tar.xz
video: return responsibility of video redraw back to playloop
When the VO was moved it its own thread, responsibility for redrawing was given to the VO thread itself. So if there was a condition that indicated that redrawing was required, like expose events or certain VOCTRLs, the VO thread was redrawing itself. This worked fine, but there are some corner cases where this works rather badly. E.g. if I fullscreen the player and hit panscan controls with mpv's default autorepeat rate, playback stops. This happens because the VO redraws itself after every panscan change command. Running each (repeated) command takes so long due to redrawing and (involuntary) waiting on vsync, that it never leaves the input processing loop while the key is held down. I suspect that in my case, redrawing in fullscreen mode just gets slow enough that it takes 2 vsyncs instead of 1 on average, and the processing time gets larger than the autorepeat delay. Fix this by taking redraw control from the VO, and instead let the playloop issue a "real" redraw command to the VO if needed. This basically reverts redraw handling to what it was before moving the VO to a thread. CC: @mpv-player/stable
Diffstat (limited to 'player')
-rw-r--r--player/playloop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/player/playloop.c b/player/playloop.c
index de1165e963..3ee37d2381 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -533,7 +533,8 @@ static void handle_osd_redraw(struct MPContext *mpctx)
// Don't redraw immediately during a seek (makes it significantly slower).
if (mpctx->d_video && mp_time_sec() - mpctx->start_timestamp < 0.1)
return;
- bool want_redraw = osd_query_and_reset_want_redraw(mpctx->osd);
+ bool want_redraw = osd_query_and_reset_want_redraw(mpctx->osd) ||
+ vo_want_redraw(mpctx->video_out);
if (!want_redraw)
return;
vo_redraw(mpctx->video_out);