diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-03-10 11:27:34 +0100 |
|---|---|---|
| committer | Josep Torra <n770galaxy@gmail.com> | 2013-03-10 12:55:52 +0100 |
| commit | 09d994628e6698aff86b2341691c790210917426 (patch) | |
| tree | 682b28fd68b58de8c551666a26ec3808ada9bb57 | |
| parent | a1982280603a2726f4723aee8c7faad901a4ad40 (diff) | |
omxvideoenc: Allocate output buffers as early as possible
| -rw-r--r-- | omx/gstomxvideoenc.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c index d671293..eb93eab 100644 --- a/omx/gstomxvideoenc.c +++ b/omx/gstomxvideoenc.c @@ -1229,13 +1229,22 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder, if (gst_omx_port_allocate_buffers (self->enc_in_port) != OMX_ErrorNone) return FALSE; - /* And disable output port */ - if (gst_omx_port_set_enabled (self->enc_out_port, FALSE) != 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; + } 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, - 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) @@ -1245,6 +1254,9 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder, OMX_StateExecuting) != OMX_ErrorNone) return FALSE; + if (gst_omx_port_populate (self->enc_out_port) != OMX_ErrorNone) + return FALSE; + if (gst_omx_component_get_state (self->enc, GST_CLOCK_TIME_NONE) != OMX_StateExecuting) return FALSE; @@ -1254,10 +1266,6 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder, gst_omx_port_set_flushing (self->enc_in_port, 5 * GST_SECOND, FALSE); gst_omx_port_set_flushing (self->enc_out_port, 5 * GST_SECOND, FALSE); - if (!needs_disable) - if (gst_omx_port_populate (self->enc_out_port) != OMX_ErrorNone) - return FALSE; - if (gst_omx_component_get_last_error (self->enc) != OMX_ErrorNone) { GST_ERROR_OBJECT (self, "Component in error state: %s (0x%08x)", gst_omx_component_get_last_error_string (self->enc), |