mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-12 11:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: Fix deadlock between ending a flush and the event handler

Browse source 
gst_omx_port_set_flushing() calls OMX_FillThisBuffer at the end of a flush
without releasing the port lock, and this can cause a deadlock with the
EventHandler. This patches fixes this by dropping the lock for the duration of
the fill buffer call.
This commit is contained in:
Arun Raghavan 2012-04-25 16:35:40 +05:30
parent d99fa5e3b3
commit 036cd16756
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
omx/gstomx.c
View file

@ -1220,7 +1220,9 @@ gst_omx_port_set_flushing (GstOMXPort * port, gboolean flush)
* valid anymore after the buffer was consumed * valid anymore after the buffer was consumed
*/ */
buf->omx_buf->nFlags = 0; buf->omx_buf->nFlags = 0;
g_mutex_unlock (port->port_lock);
err = OMX_FillThisBuffer (comp->handle, buf->omx_buf); err = OMX_FillThisBuffer (comp->handle, buf->omx_buf);
g_mutex_lock (port->port_lock);
if (err != OMX_ErrorNone) { if (err != OMX_ErrorNone) {
GST_ERROR_OBJECT (comp->parent, GST_ERROR_OBJECT (comp->parent,
"Failed to pass buffer %p (%p) to port %u: %s (0x%08x)", buf, "Failed to pass buffer %p (%p) to port %u: %s (0x%08x)", buf,