Merge tizen patch based on 1.12.2

[platform/upstream/gstreamer.git] / omx / gstomxvideodec.h

diff --git a/omx/gstomxvideodec.h b/omx/gstomxvideodec.h
old mode 100644 (file)
new mode 100755 (executable)
index 4e41796..fd08a83
--- a/omx/gstomxvideodec.h
+++ b/omx/gstomxvideodec.h
@@ -31,22 +31,6 @@
 
 #include "gstomx.h"
 
-#define OMX_VERSION_MAJOR 1
-#define OMX_VERSION_MINOR 1
-#define OMX_VERSION_REVISION 2
-#define OMX_VERSION_STEP 0
-
-#define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR)
-
-#define OMX_INIT_STRUCTURE(a) \
-    memset(&(a), 0, sizeof(a)); \
-    (a).nSize = sizeof(a); \
-    (a).nVersion.nVersion = OMX_VERSION; \
-    (a).nVersion.s.nVersionMajor = OMX_VERSION_MAJOR; \
-    (a).nVersion.s.nVersionMinor = OMX_VERSION_MINOR; \
-    (a).nVersion.s.nRevision = OMX_VERSION_REVISION; \
-    (a).nVersion.s.nStep = OMX_VERSION_STEP
-
 G_BEGIN_DECLS
 
 #define GST_TYPE_OMX_VIDEO_DEC \
@@ -62,6 +46,8 @@ G_BEGIN_DECLS
 #define GST_IS_OMX_VIDEO_DEC_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OMX_VIDEO_DEC))
 
+#define EXTRA_DECODER_OUTPUT_BUF 4
+
 typedef struct _GstOMXVideoDec GstOMXVideoDec;
 typedef struct _GstOMXVideoDecClass GstOMXVideoDecClass;
 
@@ -72,7 +58,7 @@ struct _GstOMXVideoDec
   /* < protected > */
   GstOMXComponent *dec;
   GstOMXPort *dec_in_port, *dec_out_port;
-  
+
   GstBufferPool *in_port_pool, *out_port_pool;
 
   /* < private > */
@@ -91,9 +77,9 @@ struct _GstOMXVideoDec
   gboolean draining;
 
   GstFlowReturn downstream_flow_ret;
-#ifdef GST_TIZEN_MODIFICATION
+#ifdef TIZEN_FEATURE_OMX
   gint drm_fd;
-  tbm_bufmgr hTBMBufMgr;
+  tbm_bufmgr bufmgr;
 #endif
 #ifdef USE_OMX_TARGET_RPI
   GstOMXComponent *egl_render;