mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: When acquiring a buffer from an input port always wait until all output ports are reconfigured

Browse source
This commit is contained in:
Sebastian Dröge 2011-07-18 13:10:49 +02:00
parent 9377aefb87
commit f3f3bd1dff
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
omx/gstomx.c
View file

@ -772,12 +772,12 @@ retry:
goto done;
}
/* If this is an input port and it needs to be reconfigured we
* first wait here until all output ports are reconfigured and
* then return
/* If this is an input port and at least one of the output ports
* needs to be reconfigured, we wait until all output ports are
* reconfigured. Afterwards this port is reconfigured if required
* or buffers are returned to be filled as usual.
*/
if (port->port_def.eDir == OMX_DirInput &&
port->settings_cookie != gst_omx_component_get_settings_cookie (comp)) {
if (port->port_def.eDir == OMX_DirInput) {
g_mutex_unlock (port->port_lock);
g_mutex_lock (comp->state_lock);
while (comp->reconfigure_out_pending > 0 &&
@ -800,9 +800,13 @@ retry:
goto done;
}
ret = GST_OMX_ACQUIRE_BUFFER_RECONFIGURE;
port->settings_changed = TRUE;
goto done;
/* Only if this port needs to be reconfigured too notify
* the caller about it */
if (port->settings_cookie != gst_omx_component_get_settings_cookie (comp)) {
ret = GST_OMX_ACQUIRE_BUFFER_RECONFIGURE;
port->settings_changed = TRUE;
goto done;
}
}
/* If we have an output port that needs to be reconfigured