Commit 07be06c0 authored by flx42's avatar flx42 Committed by Jean-Baptiste Kempf
Browse files

vout: check the can_sleep flag when a deadline is provided


Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent d72d22ae
......@@ -187,11 +187,11 @@ int vout_control_Pop(vout_control_t *ctrl, vout_control_cmd_t *cmd,
const mtime_t max_deadline = mdate() + timeout;
/* Spurious wakeups are perfectly fine */
if (deadline <= VLC_TS_INVALID) {
if (ctrl->can_sleep)
if (ctrl->can_sleep) {
if (deadline <= VLC_TS_INVALID)
vlc_cond_timedwait(&ctrl->wait_request, &ctrl->lock, max_deadline);
} else {
vlc_cond_timedwait(&ctrl->wait_request, &ctrl->lock, __MIN(deadline, max_deadline));
else
vlc_cond_timedwait(&ctrl->wait_request, &ctrl->lock, __MIN(deadline, max_deadline));
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment