Enabling gst-omx for TW1

Change-Id: I4597b5601a2950b4ab0628516e28966a1287c760

diff --git a/config/exynos/gstomx.conf b/config/exynos/gstomx.conf
index 2197382..946be31 100755 (executable)
--- a/config/exynos/gstomx.conf
+++ b/config/exynos/gstomx.conf
@@ -6,7 +6,7 @@ rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role;no-disable-outport
-src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ],stream-format=(string)SN12
+src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ]
 
 [omxdec_mpeg4]
 type-name=GstOMXMPEG4VideoDec
@@ -16,7 +16,7 @@ rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role;no-disable-outport
-src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ],stream-format=(string)SN12
+src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ]
 
 [omxdec_h263]
 type-name=GstOMXH263Dec
@@ -26,7 +26,7 @@ rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role;no-disable-outport
-src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ],stream-format=(string)SN12
+src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ]
 
 [omxdec_h264]
 type-name=GstOMXH264Dec
@@ -36,7 +36,7 @@ rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role;no-disable-outport
-src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ],stream-format=(string)SN12
+src-template-caps=video/x-raw,width=(int)[1,1920],height=(int)[1,1080],framerate=(fraction)[ 0/1, MAX ]
 
 [omxdec_vc1]
 type-name=GstOMXWMVDec

diff --git a/omx/gstomx.c b/omx/gstomx.c
index b55c64d..ca84a87 100755 (executable)
--- a/omx/gstomx.c
+++ b/omx/gstomx.c
@@ -1763,7 +1763,7 @@ gst_omx_port_tbm_allocate_dec_buffers (GstOMXPort * port, tbm_bufmgr bufMgr, int
           ptr->handle.dmabuf_fd[1] = gst_omx_tbm_get_bo_fd(ptr->handle.bo[1]);
           ptr->data[1] = gst_omx_tbm_get_bo_ptr(ptr->handle.bo[1]);
           ptr->size[1] = uv_size;
-          ptr->type = MM_VIDEO_BUFFER_TYPE_DMABUF_FD;
+          ptr->type = MM_VIDEO_BUFFER_TYPE_TBM_BO;
           ptr->plane_num = 2;
           GST_INFO_OBJECT (comp->parent,
                   "Allocating %d buffer bo[0]:%p bo[1]:%p fd[0]:%d fd[1]:%d size[0]:%d size[1]:%d for %s port %u", i,

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 32012e7..51ab2f9 100755 (executable)
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -132,7 +132,12 @@ gst_omx_video_dec_class_init (GstOMXVideoDecClass * klass)
 #endif
       "video/x-raw, "
       "width = " GST_VIDEO_SIZE_RANGE ", "
-      "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE;
+         "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE ", "
+#ifdef EXYNOS_SPECIFIC
+      "format = ST12";
+#else
+      "format = SN12";
+#endif
 }
 
 static void

diff --git a/packaging/gst-omx.spec b/packaging/gst-omx.spec
index a23cf5c..d0b4ebd 100755 (executable)
--- a/packaging/gst-omx.spec
+++ b/packaging/gst-omx.spec
@@ -1,7 +1,7 @@
 Name:           gst-omx
 Summary:        GStreamer plug-in that allows communication with OpenMAX IL components
 Version:        1.2.0
-Release:        1
+Release:        2
 License:        LGPL-2.1+
 Group:          Multimedia/Framework
 Source0:        %{name}-%{version}.tar.gz
@@ -14,10 +14,6 @@ BuildRequires: pkgconfig(libtbm)
 BuildRequires: pkgconfig(mm-common)
 BuildRequires: model-build-features
 
-%if "%profile" == "wearable"
-ExclusiveArch:
-%endif
-
 %description
 gst-openmax is a GStreamer plug-in that allows communication with OpenMAX IL components.
 Multiple OpenMAX IL implementations can be used.
@@ -30,8 +26,10 @@ cp %{SOURCE1001} .
 %build
 ./autogen.sh --noconfigure
 
-export CFLAGS+=" -DEXYNOS_SPECIFIC"
 export CFLAGS+=" -DGST_TIZEN_MODIFICATION"
+%if "%profile" == "wearable"
+export CFLAGS+=" -DEXYNOS_SPECIFIC"
+%endif
 
 %ifarch aarch64
 %configure --disable-static --prefix=/usr --with-omx-target=exynos64