omxvideoenc: Allocate output buffers as early as possible

diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index 0e81b3bda537f96297726a8a4f1778391d7cf502..d3e7676cfbe5f7048a676904ac32b4323c568109 100644 (file)
--- 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),