1. moved gstomx.conf to mmfw-sysconf because of different settings per target

2. consider the case where there is no specificbuffer setting

Change-Id: I466af2a624faed2d447152af1c35cefe668ff24c

diff --git a/Makefile.am b/Makefile.am
index 82affc6..b063bc1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common omx tools config m4
+SUBDIRS = common omx tools m4
 
 if BUILD_EXAMPLES
 SUBDIRS += examples

diff --git a/configure.ac b/configure.ac
index ce0b213..a275b91 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -453,11 +453,6 @@ omx/Makefile
 common/Makefile
 common/m4/Makefile
 tools/Makefile
-config/Makefile
-config/bellagio/Makefile
-config/rpi/Makefile
-config/exynos/Makefile
-config/exynos64/Makefile
 examples/Makefile
 examples/egl/Makefile
 m4/Makefile

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index a33b0e3..df0e703 100644 (file)
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -218,6 +218,7 @@ gst_omx_video_dec_open (GstVideoDecoder * decoder)
     return FALSE;
   }
 
+#ifdef USE_OMX_TARGET_EXYNOS
   {
     /* set plateform specific gem buffer settings. */
     OMX_ERRORTYPE err;
@@ -226,9 +227,8 @@ gst_omx_video_dec_open (GstVideoDecoder * decoder)
 
     err = gst_omx_component_get_extension_index (self->dec, (OMX_STRING) EXYNOS_INDEX_PARAM_STORE_METADATA_BUFFER, &index);
     if (err != OMX_ErrorNone) {
-      GST_ERROR_OBJECT (self, "Failed to get extension index : %s (0x%08x)",
+      GST_WARNING_OBJECT (self, "Failed to get extension index : %s (0x%08x)",
           gst_omx_error_to_string (err), err);
-      return FALSE;
     }
 
     OMX_INIT_PARAM (gem_param);
@@ -245,6 +245,7 @@ gst_omx_video_dec_open (GstVideoDecoder * decoder)
     self->dec_out_port->use_buffer = klass->cdata.out_port_usebuffer;
   }
 #endif
+#endif
 
   GST_DEBUG_OBJECT (self, "Opened decoder");
 

diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index c4a482d..370c03b 100644 (file)
--- a/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c
@@ -399,7 +399,11 @@ gst_omx_video_enc_open (GstVideoEncoder * encoder)
     return FALSE;
    }
 
+  self->enc_in_port->use_buffer = klass->cdata.in_port_usebuffer;
+  self->enc_out_port->use_buffer = klass->cdata.out_port_usebuffer;
+
   /* get extension index and set platform specific buffer enable */
+#ifdef USE_OMX_TARGET_EXYNOS
   {
     OMX_ERRORTYPE err;
     OMX_INDEXTYPE index = OMX_IndexComponentStartUnused;
@@ -407,9 +411,8 @@ gst_omx_video_enc_open (GstVideoEncoder * encoder)
 
     err = gst_omx_component_get_extension_index (self->enc, (OMX_STRING) EXYNOS_INDEX_PARAM_STORE_METADATA_BUFFER, &index);
     if (err != OMX_ErrorNone) {
-      GST_ERROR_OBJECT (self, "Failed to get extension index : %s (0x%08x)",
+      GST_WARNING_OBJECT (self, "Failed to get extension index : %s (0x%08x)",
           gst_omx_error_to_string (err), err);
-      return FALSE;
     }
 
     OMX_INIT_PARAM (gem_param);
@@ -417,16 +420,15 @@ gst_omx_video_enc_open (GstVideoEncoder * encoder)
     gem_param.nPortIndex = 0;
 
 
-    err = gst_omx_component_set_parameter(self->enc, index, &gem_param);
+    err = gst_omx_component_set_parameter (self->enc, index, &gem_param);
     if (err != OMX_ErrorNone) {
       GST_ERROR_OBJECT (self, "Failed to set platform specific buffer: %s (0x%08x)",
           gst_omx_error_to_string (err), err);
     }
 
-    self->enc_in_port->use_buffer = klass->cdata.in_port_usebuffer;
-    self->enc_out_port->use_buffer = klass->cdata.out_port_usebuffer;
   }
 #endif
+#endif
   return TRUE;
 }
 

diff --git a/packaging/gst-omx.spec b/packaging/gst-omx.spec
index aa3afb8..b1989cd 100644 (file)
--- a/packaging/gst-omx.spec
+++ b/packaging/gst-omx.spec
@@ -47,6 +47,5 @@ cp COPYING %{buildroot}/usr/share/license/%{name}
 %manifest gst-omx.manifest
 %defattr(-,root,root,-)
 %{_libdir}/gstreamer-1.0/libgstomx.so
-/etc/xdg/gstomx.conf
 /usr/share/license/%{name}