Commit 2b7ad7f2 authored by Guillaume Desmottes's avatar Guillaume Desmottes 🐐 Committed by Nicolas Dufresne

omx: factor out should_wait_until_flushed()

No semantic change. Makes the code easier to understand and I'm about to
change the waiting condition.

https://bugzilla.gnome.org/show_bug.cgi?id=789475
parent 7d08fc88
......@@ -1569,6 +1569,19 @@ done:
return err;
}
static gboolean
should_wait_until_flushed (GstOMXPort * port)
{
if (port->flushed)
return FALSE;
if (port->buffers
&& port->buffers->len == g_queue_get_length (&port->pending_buffers))
return FALSE;
return TRUE;
}
/* NOTE: Uses comp->lock and comp->messages_lock */
OMX_ERRORTYPE
gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout,
......@@ -1633,9 +1646,7 @@ gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout,
}
if (timeout == 0) {
if (!port->flushed || (port->buffers
&& port->buffers->len >
g_queue_get_length (&port->pending_buffers)))
if (should_wait_until_flushed (port))
err = OMX_ErrorTimeout;
goto done;
}
......@@ -1646,10 +1657,7 @@ gst_omx_port_set_flushing (GstOMXPort * port, GstClockTime timeout,
signalled = TRUE;
last_error = OMX_ErrorNone;
gst_omx_component_handle_messages (comp);
while (!port->flushed &&
(port->buffers
&& port->buffers->len >
g_queue_get_length (&port->pending_buffers))) {
while (should_wait_until_flushed (port)) {
signalled = gst_omx_component_wait_message (comp, timeout);
if (signalled)
gst_omx_component_handle_messages (comp);
......
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