diff options
| author | Christian König <christian.koenig@amd.com> | 2014-03-01 22:28:24 +0100 |
|---|---|---|
| committer | Leo Liu <leo.liu@amd.com> | 2014-03-03 16:00:00 -0500 |
| commit | 6d0b6813745b54eb5dd249ba4446118b21383059 (patch) | |
| tree | 7f3142d5a385c8aa4bd39fd446661f5ecc5241bb | |
| parent | ba51373c66f4c9c3349eb083c5218b31e4162a6e (diff) | |
omx: fix two serious message handling bugs
Waiting for the next message if we already got one
is nonsense and can lead to lockups.
https://bugzilla.gnome.org/show_bug.cgi?id=725468
| -rw-r--r-- | omx/gstomx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/omx/gstomx.c b/omx/gstomx.c index df3a8ff..b77c904 100644 --- a/omx/gstomx.c +++ b/omx/gstomx.c @@ -842,8 +842,7 @@ gst_omx_component_get_state (GstOMXComponent * comp, GstClockTime timeout) g_mutex_unlock (&comp->lock); if (!g_queue_is_empty (&comp->messages)) { signalled = TRUE; - } - if (timeout == GST_CLOCK_TIME_NONE) { + } else if (timeout == GST_CLOCK_TIME_NONE) { g_cond_wait (&comp->messages_cond, &comp->messages_lock); signalled = TRUE; } else { @@ -1519,8 +1518,7 @@ gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout, if (!g_queue_is_empty (&comp->messages)) { signalled = TRUE; - } - if (timeout == GST_CLOCK_TIME_NONE) { + } else if (timeout == GST_CLOCK_TIME_NONE) { g_cond_wait (&comp->messages_cond, &comp->messages_lock); signalled = TRUE; } else { |