diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-03-11 13:45:04 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-03-11 13:45:04 +0100 |
| commit | 3c13502b75a8fa64d106e28c6b964c2c0f8a0f7e (patch) | |
| tree | d5078ab7fcdad225f62a6924d5f10ac2f466a4f6 | |
| parent | bd53faacc948607e89064693471406ea1c245930 (diff) | |
| download | gst-omx-3c13502b75a8fa64d106e28c6b964c2c0f8a0f7e.tar.gz | |
omxvideoenc: Always allocate output buffers from the loop function
| -rw-r--r-- | omx/gstomxvideoenc.c | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c index eeffc4f..e8078aa 100644 --- a/omx/gstomxvideoenc.c +++ b/omx/gstomxvideoenc.c @@ -1245,27 +1245,7 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder, return FALSE; if (gst_omx_port_mark_reconfigured (self->enc_in_port) != OMX_ErrorNone) 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 { - gboolean have_output_buffers = FALSE; - if (gst_omx_component_set_state (self->enc, OMX_StateIdle) != OMX_ErrorNone) 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) 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_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; + /* 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; - } + if (gst_omx_port_wait_enabled (self->enc_out_port, + 1 * GST_SECOND) != OMX_ErrorNone) + return FALSE; if (gst_omx_component_get_state (self->enc, 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, GST_CLOCK_TIME_NONE) != OMX_StateExecuting) 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 */ |