Skip to content

V
vlc-2-2
Commit 453264d4 authored by Felix Abecassis's avatar Felix Abecassis Committed by Jean-Baptiste Kempf
Browse files
Options

vout: refactor deadline computation for cond_timedwait in vout_control_Pop 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 07be06c0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
src/video_output/control.c
View file @ 453264d4
...@@ -185,14 +185,11 @@ int vout_control_Pop(vout_control_t *ctrl, vout_control_cmd_t *cmd, ...@@ -185,14 +185,11 @@ int vout_control_Pop(vout_control_t *ctrl, vout_control_cmd_t *cmd,
vlc_cond_broadcast(&ctrl->wait_acknowledge); vlc_cond_broadcast(&ctrl->wait_acknowledge);
const mtime_t max_deadline = mdate() + timeout; const mtime_t max_deadline = mdate() + timeout;
const mtime_t wait_deadline = deadline <= VLC_TS_INVALID ? max_deadline : __MIN(deadline, max_deadline);
/* Spurious wakeups are perfectly fine */ /* Spurious wakeups are perfectly fine */
if (ctrl->can_sleep) { if (ctrl->can_sleep)
if (deadline <= VLC_TS_INVALID) vlc_cond_timedwait(&ctrl->wait_request, &ctrl->lock, wait_deadline);
vlc_cond_timedwait(&ctrl->wait_request, &ctrl->lock, max_deadline);
else
vlc_cond_timedwait(&ctrl->wait_request, &ctrl->lock, __MIN(deadline, max_deadline));
}
} }
bool has_cmd; bool has_cmd;
......
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