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

Revert "vo: remove frame timing check from vo_still_displaying()"

Browse Source 
This reverts commit ef11d31c3a.
This commit is contained in:
Kacper Michajłow 2024-02-04 16:33:55 +01:00 committed by Dudemanguy
parent 31a5f77ceb
commit 0bf4da0f5e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
video/out/vo.c
View File

@ -1202,9 +1202,16 @@ void vo_seek_reset(struct vo *vo)
bool vo_still_displaying(struct vo *vo)
{
struct vo_internal *in = vo->in;
mp_mutex_lock(&in->lock);
bool working = in->rendering || in->frame_queued;
mp_mutex_unlock(&in->lock);
mp_mutex_lock(&vo->in->lock);
int64_t now = mp_time_ns();
int64_t frame_end = 0;
if (in->current_frame) {
frame_end = in->current_frame->pts + MPMAX(in->current_frame->duration, 0);
if (in->current_frame->display_synced)
frame_end = in->current_frame->num_vsyncs > 0 ? INT64_MAX : 0;
}
bool working = now < frame_end || in->rendering || in->frame_queued;
mp_mutex_unlock(&vo->in->lock);
return working && in->hasframe;
}