Skip to content

V
vlc
Commit 6b19e711 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

omx: fix timeout handling

parent 0a7e31db
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/codec/omxil/utils.c
View file @ 6b19e711
...@@ -81,13 +81,14 @@ OMX_ERRORTYPE WaitForOmxEvent(OmxEventQueue *queue, OMX_EVENTTYPE *event, ...@@ -81,13 +81,14 @@ OMX_ERRORTYPE WaitForOmxEvent(OmxEventQueue *queue, OMX_EVENTTYPE *event,
OMX_U32 *data_1, OMX_U32 *data_2, OMX_PTR *event_data) OMX_U32 *data_1, OMX_U32 *data_2, OMX_PTR *event_data)
{ {
OmxEvent *p_event; OmxEvent *p_event;
mtime_t deadline = mdate() + CLOCK_FREQ;
vlc_mutex_lock(&queue->mutex); vlc_mutex_lock(&queue->mutex);
if(!queue->p_events) while ((p_event = queue->p_events) == NULL)
vlc_cond_timedwait(&queue->cond, &queue->mutex, mdate()+CLOCK_FREQ); if (vlc_cond_timedwait(&queue->cond, &queue->mutex, deadline))
break;
p_event = queue->p_events;
if(p_event) if(p_event)
{ {
queue->p_events = p_event->next; queue->p_events = p_event->next;
......
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