mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideoenc: Only enable the output port after we know the output format

Browse source
This commit is contained in:
Sebastian Dröge 2013-03-01 11:24:56 +01:00
parent 63e0d61971
commit a53c5638e2
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
omx/gstomxvideoenc.c
View file

@ -756,7 +756,8 @@ gst_omx_video_enc_loop (GstOMXVideoEnc * self)
GST_DEBUG_OBJECT (self, "Port settings have changed, updating caps"); GST_DEBUG_OBJECT (self, "Port settings have changed, updating caps");
if (acq_return == GST_OMX_ACQUIRE_BUFFER_RECONFIGURE) { if (acq_return == GST_OMX_ACQUIRE_BUFFER_RECONFIGURE
&& gst_omx_port_is_enabled (port)) {
/* Reallocate all buffers */ /* Reallocate all buffers */
err = gst_omx_port_set_enabled (port, FALSE); err = gst_omx_port_set_enabled (port, FALSE);
if (err != OMX_ErrorNone) if (err != OMX_ErrorNone)
@ -1189,10 +1190,6 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
if (!gst_omx_port_update_port_definition (self->enc_in_port, &port_def)) if (!gst_omx_port_update_port_definition (self->enc_in_port, &port_def))
return FALSE; return FALSE;
GST_DEBUG_OBJECT (self, "Setting outport port definition");
if (!gst_omx_port_update_port_definition (self->enc_out_port, NULL))
return FALSE;
if (klass->set_format) { if (klass->set_format) {
if (!klass->set_format (self, self->enc_in_port, state)) { if (!klass->set_format (self, self->enc_in_port, state)) {
GST_ERROR_OBJECT (self, "Subclass failed to set the new format"); GST_ERROR_OBJECT (self, "Subclass failed to set the new format");
@ -1200,6 +1197,10 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
} }
} }
GST_DEBUG_OBJECT (self, "Updating outport port definition");
if (!gst_omx_port_update_port_definition (self->enc_out_port, NULL))
return FALSE;
GST_DEBUG_OBJECT (self, "Enabling component"); GST_DEBUG_OBJECT (self, "Enabling component");
if (needs_disable) { if (needs_disable) {
if (gst_omx_port_set_enabled (self->enc_in_port, TRUE) != OMX_ErrorNone) if (gst_omx_port_set_enabled (self->enc_in_port, TRUE) != OMX_ErrorNone)
@ -1218,7 +1219,13 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
/* Need to allocate buffers to reach Idle state */ /* Need to allocate buffers to reach Idle state */
if (gst_omx_port_allocate_buffers (self->enc_in_port, -1) != OMX_ErrorNone) if (gst_omx_port_allocate_buffers (self->enc_in_port, -1) != OMX_ErrorNone)
return FALSE; return FALSE;
if (gst_omx_port_allocate_buffers (self->enc_out_port, -1) != OMX_ErrorNone)
/* And disable output port */
if (gst_omx_port_set_enabled (self->enc_out_port, FALSE) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_wait_enabled (self->enc_out_port,
1 * GST_SECOND) != OMX_ErrorNone)
return FALSE; return FALSE;
if (gst_omx_component_get_state (self->enc, if (gst_omx_component_get_state (self->enc,