omx: Remove min buffer count hack for RPi again

It's not necessary anymore

diff --git a/config/rpi/gstomx.conf b/config/rpi/gstomx.conf
index 21d094d..6bfb9a5 100644 (file)
--- a/config/rpi/gstomx.conf
+++ b/config/rpi/gstomx.conf
@@ -5,7 +5,7 @@ component-name=OMX.broadcom.video_decode
 rank=256
 in-port-index=130
 out-port-index=131
-hacks=no-empty-eos-buffer;no-component-role;port-actual-count-is-minimum;no-component-reconfigure
+hacks=no-empty-eos-buffer;no-component-role;no-component-reconfigure
 
 [omxh264dec]
 type-name=GstOMXH264Dec
@@ -14,7 +14,7 @@ component-name=OMX.broadcom.video_decode
 rank=256
 in-port-index=130
 out-port-index=131
-hacks=no-empty-eos-buffer;no-component-role;port-actual-count-is-minimum;no-component-reconfigure
+hacks=no-empty-eos-buffer;no-component-role;no-component-reconfigure
 
 [omxmpeg2dec]
 type-name=GstOMXMPEG2Dec
@@ -23,7 +23,7 @@ component-name=OMX.broadcom.video_decode
 rank=256
 in-port-index=130
 out-port-index=131
-hacks=no-empty-eos-buffer;no-component-role;port-actual-count-is-minimum;no-component-reconfigure
+hacks=no-empty-eos-buffer;no-component-role;no-component-reconfigure
 
 [omxmpeg4videoenc]
 type-name=GstOMXMPEG4VideoEnc
@@ -32,7 +32,7 @@ component-name=OMX.broadcom.video_encode
 rank=256
 in-port-index=200
 out-port-index=201
-hacks=no-empty-eos-buffer;no-component-role;port-actual-count-is-minimum;no-component-reconfigure
+hacks=no-empty-eos-buffer;no-component-role;no-component-reconfigure
 
 [omxh264enc]
 type-name=GstOMXH264Enc
@@ -41,5 +41,5 @@ component-name=OMX.broadcom.video_encode
 rank=256
 in-port-index=200
 out-port-index=201
-hacks=no-empty-eos-buffer;no-component-role;port-actual-count-is-minimum;no-component-reconfigure
+hacks=no-empty-eos-buffer;no-component-role;no-component-reconfigure
 

diff --git a/omx/gstomx.c b/omx/gstomx.c
index 5547025..034f92a 100644 (file)
--- a/omx/gstomx.c
+++ b/omx/gstomx.c
@@ -874,11 +874,6 @@ gst_omx_component_add_port (GstOMXComponent * comp, guint32 index)
   port->enabled_pending = FALSE;
   port->disabled_pending = FALSE;
 
-  if (comp->hacks & GST_OMX_HACK_PORT_ACTUAL_COUNT_IS_MINIMUM) {
-    port->min_buffer_count = port->port_def.nBufferCountActual;
-    port->port_def.nBufferCountMin = port->min_buffer_count;
-  }
-
   if (port->port_def.eDir == OMX_DirInput)
     comp->n_in_ports++;
   else
@@ -1119,8 +1114,6 @@ gst_omx_port_get_port_definition (GstOMXPort * port,
 
   err = gst_omx_component_get_parameter (comp, OMX_IndexParamPortDefinition,
       port_def);
-  if (comp->hacks & GST_OMX_HACK_PORT_ACTUAL_COUNT_IS_MINIMUM)
-    port_def->nBufferCountMin = port->min_buffer_count;
 
   return err;
 }
@@ -1143,9 +1136,6 @@ gst_omx_port_update_port_definition (GstOMXPort * port,
   gst_omx_component_get_parameter (comp, OMX_IndexParamPortDefinition,
       &port->port_def);
 
-  if (comp->hacks & GST_OMX_HACK_PORT_ACTUAL_COUNT_IS_MINIMUM)
-    port->port_def.nBufferCountMin = port->min_buffer_count;
-
   GST_DEBUG_OBJECT (comp->parent, "Updated port %u definition: %s (0x%08x)",
       port->index, gst_omx_error_to_string (err), err);
 
@@ -2322,7 +2312,7 @@ gst_omx_error_to_string (OMX_ERRORTYPE err)
 }
 
 #if defined(USE_OMX_TARGET_RPI)
-#define DEFAULT_HACKS (GST_OMX_HACK_NO_EMPTY_EOS_BUFFER | GST_OMX_HACK_NO_COMPONENT_ROLE | GST_OMX_HACK_PORT_ACTUAL_COUNT_IS_MINIMUM | GST_OMX_HACK_NO_COMPONENT_RECONFIGURE)
+#define DEFAULT_HACKS (GST_OMX_HACK_NO_EMPTY_EOS_BUFFER | GST_OMX_HACK_NO_COMPONENT_ROLE | GST_OMX_HACK_NO_COMPONENT_RECONFIGURE)
 #else
 #define DEFAULT_HACKS (0)
 #endif
@@ -2354,8 +2344,6 @@ gst_omx_parse_hacks (gchar ** hacks)
       hacks_flags |= GST_OMX_HACK_DRAIN_MAY_NOT_RETURN;
     else if (g_str_equal (*hacks, "no-component-role"))
       hacks_flags |= GST_OMX_HACK_NO_COMPONENT_ROLE;
-    else if (g_str_equal (*hacks, "port-actual-count-is-minimum"))
-      hacks_flags |= GST_OMX_HACK_PORT_ACTUAL_COUNT_IS_MINIMUM;
     else
       GST_WARNING ("Unknown hack: %s", *hacks);
     hacks++;

diff --git a/omx/gstomx.h b/omx/gstomx.h
index 03a38b3..f10fd1d 100644 (file)
--- a/omx/gstomx.h
+++ b/omx/gstomx.h
@@ -103,12 +103,6 @@ G_BEGIN_DECLS
  */
 #define GST_OMX_HACK_NO_COMPONENT_ROLE                                G_GUINT64_CONSTANT (0x0000000000000080)
 
-/* If the component reports the minimum number of required
- * buffers via nBufferCountActual instead of nBufferCountMin.
- * Happens with Broadcom's OpenMAX implementation.
- */
-#define GST_OMX_HACK_PORT_ACTUAL_COUNT_IS_MINIMUM                     G_GUINT64_CONSTANT (0x0000000000000100)
-
 typedef struct _GstOMXCore GstOMXCore;
 typedef struct _GstOMXPort GstOMXPort;
 typedef enum _GstOMXPortDirection GstOMXPortDirection;
@@ -204,9 +198,6 @@ struct _GstOMXPort {
    */
   gint settings_cookie;
   gint configured_settings_cookie;
-
-  /* Only valid if GST_OMX_HACK_PORT_ACTUAL_COUNT_IS_MINIMUM */
-  gint min_buffer_count;
 };
 
 struct _GstOMXComponent {