mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideoenc: Always allocate output buffers from the loop function

Browse source
This commit is contained in:
Sebastian Dröge 2013-03-11 13:45:04 +01:00
parent bd53faacc9
commit 3c13502b75
1 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
omx/gstomxvideoenc.c
View file

@ -1245,27 +1245,7 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
return FALSE; return FALSE;
if (gst_omx_port_mark_reconfigured (self->enc_in_port) != OMX_ErrorNone) if (gst_omx_port_mark_reconfigured (self->enc_in_port) != OMX_ErrorNone)
return FALSE; return FALSE;
/* If the output port is already configured with the new format we can
* allocate buffers here already */
if (self->enc_out_port->port_def.format.video.nFrameHeight == info->height
&& self->enc_out_port->port_def.format.video.nFrameWidth ==
info->width) {
if (gst_omx_port_set_enabled (self->enc_out_port, TRUE) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_allocate_buffers (self->enc_out_port) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_wait_enabled (self->enc_out_port,
3 * GST_SECOND) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_populate (self->enc_out_port) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_mark_reconfigured (self->enc_out_port) != OMX_ErrorNone)
return FALSE;
}
} else { } else {
gboolean have_output_buffers = FALSE;
if (gst_omx_component_set_state (self->enc, OMX_StateIdle) != OMX_ErrorNone) if (gst_omx_component_set_state (self->enc, OMX_StateIdle) != OMX_ErrorNone)
return FALSE; return FALSE;
@ -1273,23 +1253,13 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
if (gst_omx_port_allocate_buffers (self->enc_in_port) != OMX_ErrorNone) if (gst_omx_port_allocate_buffers (self->enc_in_port) != OMX_ErrorNone)
return FALSE; return FALSE;
/* If the output port is already configured with the new format we can /* And disable output port */
* allocate buffers here already */ if (gst_omx_port_set_enabled (self->enc_out_port, FALSE) != OMX_ErrorNone)
if (self->enc_out_port->port_def.format.video.nFrameHeight == info->height return FALSE;
&& self->enc_out_port->port_def.format.video.nFrameWidth ==
info->width) {
if (gst_omx_port_allocate_buffers (self->enc_out_port) != OMX_ErrorNone)
return FALSE;
have_output_buffers = TRUE;
} else {
/* 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, if (gst_omx_port_wait_enabled (self->enc_out_port,
1 * GST_SECOND) != OMX_ErrorNone) 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,
GST_CLOCK_TIME_NONE) != OMX_StateIdle) GST_CLOCK_TIME_NONE) != OMX_StateIdle)
@ -1302,13 +1272,6 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
if (gst_omx_component_get_state (self->enc, if (gst_omx_component_get_state (self->enc,
GST_CLOCK_TIME_NONE) != OMX_StateExecuting) GST_CLOCK_TIME_NONE) != OMX_StateExecuting)
return FALSE; return FALSE;
if (have_output_buffers) {
if (gst_omx_port_populate (self->enc_out_port) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_mark_reconfigured (self->enc_out_port) != OMX_ErrorNone)
return FALSE;
}
} }
/* Unset flushing to allow ports to accept data again */ /* Unset flushing to allow ports to accept data again */