Merge tizen patch based on 1.12.2

Change-Id: I3de5759ac30cd4932ca8a256b59d8ecc44e97ea8

diff --cc .gbs.conf
index fa9fdc5,99e7cc8..23d6959
--- 1/.gbs.conf
--- 2/.gbs.conf
+++ b/.gbs.conf
@@@ -1,3 -1,3 +1,3 @@@
  [general]
--upstream_branch = upstream
- upstream_tag = ${upstreamversion}
++upstream_branch = upstream/1.12
+ upstream_tag = upstream/${upstreamversion}

diff --cc .gitmodules
index a6b1eda,a6b1eda..e69de29
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,3 -1,3 +1,0 @@@
--[submodule "common"]
--      path = common
--      url = git://anongit.freedesktop.org/gstreamer/common

diff --cc Makefile.am
index 82affc6,b063bc1..b063bc1
mode 100755,100644..100755
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am

diff --cc config/bellagio/gstomx.conf
index 78f8e7d,5ca8ba6..5ca8ba6
mode 100755,100644..100755
--- 1/config/bellagio/gstomx.conf
--- 2/config/bellagio/gstomx.conf
+++ b/config/bellagio/gstomx.conf

diff --cc config/exynos/gstomx.conf
index 0113214,e83ec55..e83ec55
mode 100755,100644..100755
--- 1/config/exynos/gstomx.conf
--- 2/config/exynos/gstomx.conf
+++ b/config/exynos/gstomx.conf

diff --cc config/rpi/gstomx.conf
index 9e23d45,8b5c7d6..21ab304
mode 100755,100644..100755
--- 1/config/rpi/gstomx.conf
--- 2/config/rpi/gstomx.conf
+++ b/config/rpi/gstomx.conf
@@@ -75,28 -75,28 +75,48 @@@ sink-template-caps=video/x-wmv,wmvversi
  type-name=GstOMXH264Enc
  core-name=/opt/vc/lib/libopenmaxil.so
  component-name=OMX.broadcom.video_encode
- rank=256
+ rank=257
  in-port-index=200
  out-port-index=201
+ hacks=no-component-role;no-component-reconfigure
+ 
+ [omxanalogaudiosink]
+ type-name=GstOMXAnalogAudioSink
+ core-name=/opt/vc/lib/libopenmaxil.so
+ component-name=OMX.broadcom.audio_render
+ rank=257
+ in-port-index=100
+ out-port-index=101
  hacks=no-component-role
+ sink-template-caps=audio/x-raw,format=(string){S16LE,S32LE},layout=(string)interleaved,rate=(int){8000,11025,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000},channels=(int)[1,2]
+ 
+ [omxhdmiaudiosink]
+ type-name=GstOMXHdmiAudioSink
+ core-name=/opt/vc/lib/libopenmaxil.so
+ component-name=OMX.broadcom.audio_render
+ rank=258
+ in-port-index=100
+ out-port-index=101
+ hacks=no-component-role
+ sink-template-caps=audio/x-raw,format=(string){S16LE,S32LE},layout=(string)interleaved,rate=(int){8000,11025,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000},channels=(int)[1,8];audio/x-ac3,framed=(boolean)true;audio/x-dts,framed=(boolean)true,block-size=(int){512,1024,2048}
  
 +[omxanalogaudiosink]
 +type-name=GstOMXAnalogAudioSink
 +core-name=/opt/vc/lib/libopenmaxil.so
 +component-name=OMX.broadcom.audio_render
 +rank=257
 +in-port-index=100
 +out-port-index=101
 +hacks=no-component-role
 +sink-template-caps=audio/x-raw,format=(string){S16LE,S32LE},layout=(string)interleaved,rate=(int){8000,11025,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000},channels=(int)[1,2]
 +
 +[omxhdmiaudiosink]
 +type-name=GstOMXHdmiAudioSink
 +core-name=/opt/vc/lib/libopenmaxil.so
 +component-name=OMX.broadcom.audio_render
 +rank=258
 +in-port-index=100
 +out-port-index=101
 +hacks=no-component-role
 +sink-template-caps=audio/x-raw,format=(string){S16LE,S32LE},layout=(string)interleaved,rate=(int){8000,11025,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000},channels=(int)[1,8];audio/x-ac3,framed=(boolean)true;audio/x-dts,framed=(boolean)true,block-size=(int){512,1024,2048}
 +

diff --cc configure.ac
index f523e32,11108c9..11108c9
mode 100755,100644..100755
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac

diff --cc examples/egl/testegl.c
index bccf6c1,99aa810..99aa810
mode 100644,100644..100755
--- 1/examples/egl/testegl.c
--- 2/examples/egl/testegl.c
+++ b/examples/egl/testegl.c

diff --cc omx/Makefile.am
index 5462a4b,23742f3..23742f3
mode 100644,100644..100755
--- 1/omx/Makefile.am
--- 2/omx/Makefile.am
+++ b/omx/Makefile.am

diff --cc omx/gstomx.h
index 6e8398f,97141bc..97141bc
mode 100644,100644..100755
--- 1/omx/gstomx.h
--- 2/omx/gstomx.h
+++ b/omx/gstomx.h

diff --cc omx/gstomxaudiodec.c
index 9b84555,b6fdf34..b6fdf34
mode 100755,100644..100755
--- 1/omx/gstomxaudiodec.c
--- 2/omx/gstomxaudiodec.c
+++ b/omx/gstomxaudiodec.c

diff --cc omx/gstomxaudioenc.c
index 8724f5e,a6ba861..a6ba861
mode 100644,100644..100755
--- 1/omx/gstomxaudioenc.c
--- 2/omx/gstomxaudioenc.c
+++ b/omx/gstomxaudioenc.c

diff --cc omx/gstomxbufferpool.c
index fa3f8e7,460c7c2..460c7c2
mode 100755,100644..100755
--- 1/omx/gstomxbufferpool.c
--- 2/omx/gstomxbufferpool.c
+++ b/omx/gstomxbufferpool.c

diff --cc omx/gstomxbufferpool.h
index 76f9680,87b27d3..87b27d3
mode 100755,100644..100755
--- 1/omx/gstomxbufferpool.h
--- 2/omx/gstomxbufferpool.h
+++ b/omx/gstomxbufferpool.h

diff --cc omx/gstomxh264enc.c
index aa33ae5,b055b3c..b055b3c
mode 100644,100644..100755
--- 1/omx/gstomxh264enc.c
--- 2/omx/gstomxh264enc.c
+++ b/omx/gstomxh264enc.c

diff --cc omx/gstomxh264enc.h
index 03326e1,8887c84..8887c84
mode 100644,100644..100755
--- 1/omx/gstomxh264enc.h
--- 2/omx/gstomxh264enc.h
+++ b/omx/gstomxh264enc.h

diff --cc omx/gstomxvideo.c
index 9eb6769,b4b7247..b4b7247
mode 100755,100644..100755
--- 1/omx/gstomxvideo.c
--- 2/omx/gstomxvideo.c
+++ b/omx/gstomxvideo.c

diff --cc omx/gstomxvideodec.c
index 7082bb8,0cbf372..d04daf7
mode 100755,100644..100755
--- 1/omx/gstomxvideodec.c
--- 2/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@@ -1359,9 -1421,13 +1421,19 @@@ gst_omx_video_dec_loop (GstOMXVideoDec 
    GstOMXAcquireBufferReturn acq_return;
    GstClockTimeDiff deadline;
    OMX_ERRORTYPE err;
+ #ifdef TIZEN_FEATURE_OMX
+   GstBuffer *flush_request_buffer = NULL;
+   GstMessage *msg = NULL;
+ #endif
+ 
+ #if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
+   port = self->eglimage ? self->egl_out_port : self->dec_out_port;
++#else
++  port = self->dec_out_port;
++#endif
 +
 +#if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
 +  port = self->eglimage ? self->egl_out_port : self->dec_out_port;
  #else
    port = self->dec_out_port;
  #endif

diff --cc omx/gstomxvideodec.h
index 4e41796,fd08a83..fd08a83
mode 100644,100644..100755
--- 1/omx/gstomxvideodec.h
--- 2/omx/gstomxvideodec.h
+++ b/omx/gstomxvideodec.h

diff --cc omx/gstomxvideoenc.c
index 5c1d7fc,0c84e6f..0c84e6f
mode 100644,100644..100755
--- 1/omx/gstomxvideoenc.c
--- 2/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c

diff --cc omx/gstomxvideoenc.h
index 6dbb1c7,06748c0..06748c0
mode 100644,100644..100755
--- 1/omx/gstomxvideoenc.h
--- 2/omx/gstomxvideoenc.h
+++ b/omx/gstomxvideoenc.h

diff --cc packaging/common.tar.gz
index 0000000,0000000..c3aef17
new file mode 100644 (file)
Binary files differ

diff --cc packaging/gst-omx.spec
index f251385,e62c5ae..2ff2c82
mode 100755,100644..100755
--- 1/packaging/gst-omx.spec
--- 2/packaging/gst-omx.spec
+++ b/packaging/gst-omx.spec
@@@ -1,10 -1,12 +1,12 @@@
  Name:           gst-omx
  Summary:        GStreamer plug-in that allows communication with OpenMAX IL components
 -Version:        1.2.4
 -Release:        9
 +Version:        1.3.0
 +Release:        0
  License:        LGPL-2.1+
  Group:          Multimedia/Framework
- Source:        %{name}-%{version}.tar.gz
+ Source0:        %{name}-%{version}.tar.gz
 -Source100:      common.tar.bz2
++Source100:      common.tar.gz
+ Source1001:     gst-omx.manifest
  BuildRequires:  which
  BuildRequires:  pkgconfig(gstreamer-1.0)
  BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)