mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

video: actually wait for last frame being rendered on EOF

Browse Source 
The video timing code could just decide that EOF was reached before it
was displayed. This is not really a problem for normal playback (if you
use something like --keep-open it'd show the last frame anyway,
otherwise it'd at best flash it on screen before destroying the window).
But in encode mode, it really matters, and makes the difference between
having one frame more or less in the output file.

Fix this by waiting for the VO before starting the real EOF.
vo_is_ready_for_frame() is normally used to determine when the VO frame
queue has enough space to send a new frame. Since the VO frame queue is
currently at most 1 frame, it being signaled means the remaining frame
was consumed and thus sent to the VO driver. If it returns false, it
will wake up the playloop as soon as the state changes.

I also considered using vo_still_displaying(), but it's not reliable,
because it checks the realtime of the frame end display time.
This commit is contained in:
wm4 2018-04-29 16:04:50 +02:00 committed by Jan Ekström
parent f18c4175ad
commit 1a339fa09d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
player/video.c
View File

@ -1017,7 +1017,11 @@ void write_video(struct MPContext *mpctx)
mpctx->time_frame = 0;
}
if (mpctx->video_status == STATUS_DRAINING) {
// Wait for the VO to signal actual EOF, then exit if the frame timer
// has expired.
if (mpctx->video_status == STATUS_DRAINING &&
vo_is_ready_for_frame(vo, -1))
{
mpctx->time_frame -= get_relative_time(mpctx);
mp_set_timeout(mpctx, mpctx->time_frame);
if (mpctx->time_frame <= 0) {