1. Fix build error - wayland environment

2. Remove build warnings in encodebin

Change-Id: I28e15ce46971643991e91596c800ddda3c77b425
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 8849fba..bd01e7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,78 +5,78 @@ aclocaldir = $(datadir)/aclocal
 
 SUBDIRS = common
 
-if GST_EXT_USE_EXT_ENCODEBIN
+if GST_TIZEN_USE_ENCODEBIN
 SUBDIRS += encodebin
 endif
 
-if GST_EXT_USE_EXT_EVASIMAGESINK
+if GST_TIZEN_USE_EVASIMAGESINK
 SUBDIRS += evasimagesink
 endif
 
-#if GST_EXT_USE_EXT_EVASPIXMAPSINK
+#if GST_TIZEN_USE_EVASPIXMAPSINK
 #SUBDIRS += evaspixmapsink
 #endif
 
-#if GST_EXT_USE_EXT_XVIMAGESRC
-#SUBDIRS += xvimagesrc
-#endif
+if GST_TIZEN_USE_XVIMAGESRC
+SUBDIRS += xvimagesrc
+endif
 
-if GST_EXT_USE_EXT_DRMSRC
+if GST_TIZEN_USE_DRMSRC
 SUBDIRS += drmsrc
 endif
 
-if GST_EXT_USE_EXT_TOGGLE
+if GST_TIZEN_USE_TOGGLE
 SUBDIRS += toggle
 endif
 
-if GST_EXT_USE_EXT_PD_PUSHSRC
+if GST_TIZEN_USE_PD_PUSHSRC
 SUBDIRS += pdpushsrc
 endif
 
-if GST_EXT_USE_EXT_AUDIOTP
+if GST_TIZEN_USE_AUDIOTP
 SUBDIRS += audiotp
 endif
 
-if GST_EXT_USE_EXT_AUDIOEQ
+if GST_TIZEN_USE_AUDIOEQ
 SUBDIRS += audioeq
 endif
 
-#if GST_EXT_USE_EXT_FIMCCONVERT
+#if GST_TIZEN_USE_FIMCCONVERT
 #SUBDIRS += fimcconvert
 #endif
 
-#if GST_EXT_USE_EXT_WFDRTSPSRC
+#if GST_TIZEN_USE_WFDRTSPSRC
 #SUBDIRS += wfdrtspsrc
 #endif
 
 DIST_SUBDIRS = common
 
-if GST_EXT_USE_EXT_ENCODEBIN
+if GST_TIZEN_USE_ENCODEBIN
 DIST_SUBDIRS += encodebin
 endif
 
-if GST_EXT_USE_EXT_EVASIMAGESINK
+if GST_TIZEN_USE_EVASIMAGESINK
 DIST_SUBDIRS += evasimagesink
 endif
 
-if GST_EXT_USE_EXT_XVIMAGESRC
+if GST_TIZEN_USE_XVIMAGESRC
 DIST_SUBDIRS += xvimagesrc
 endif
 
-if GST_EXT_USE_EXT_DRMSRC
+if GST_TIZEN_USE_DRMSRC
 DIST_SUBDIRS += drmsrc
 endif
 
-if GST_EXT_USE_EXT_TOGGLE
+if GST_TIZEN_USE_TOGGLE
 DIST_SUBDIRS += toggle
 endif
 
-if GST_EXT_USE_EXT_FIMCCONVERT
+if GST_TIZEN_USE_FIMCCONVERT
 DIST_SUBDIRS += fimcconvert
 endif
 
 
-#if GST_EXT_USE_EXT_WFDRTSPSRC
+#if GST_TIZEN_USE_WFDRTSPSRC
 #DIST_SUBDIRS += wfdrtspsrc
 #endif
 

diff --git a/configure.ac b/configure.ac
index 488d9b9..d16fd5b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT(extension, 1.0)
+AC_INIT(gst-plugins-tizen, 1.0)
  
 dnl versions of gstreamer and plugins-base
 GST_MAJORMINOR=1.0
@@ -156,35 +156,13 @@ dnl make _CFLAGS and _LIBS available
 AC_SUBST(GST_VIDEO_CFLAGS)
 AC_SUBST(GST_VIDEO_LIBS)
 
-dnl xvimagesrc _CFLAGS and _LIB available
-
-PKG_CHECK_MODULES(DRI2, libdri2)
-AC_SUBST(DRI2_CFLAGS)
-AC_SUBST(DRI2_LIBS)
-
-PKG_CHECK_MODULES(X11, x11)
-AC_SUBST(X11_CFLAGS)
-AC_SUBST(X11_LIBS)
-
-PKG_CHECK_MODULES(XEXT, xext)
-AC_SUBST(XEXT_CFLAGS)
-AC_SUBST(XEXT_LIBS)
-
-PKG_CHECK_MODULES(XV, xv)
-AC_SUBST(XV_CFLAGS)
-AC_SUBST(XV_LIBS)
-
-PKG_CHECK_MODULES(XDAMAGE, xdamage)
-AC_SUBST(XDAMAGE_CFLAGS)
-AC_SUBST(XDAMAGE_LIBS)
-
 PKG_CHECK_MODULES(DRM, libdrm)
 AC_SUBST(DRM_CFLAGS)
 AC_SUBST(DRM_LIBS)
 
-PKG_CHECK_MODULES(DRM, libdrm-devel)
-AC_SUBST(DRM_DEVEL_CFLAGS)
-AC_SUBST(DRM_DEVEL_LIBS)
+PKG_CHECK_MODULES(DRM_EXYNOS, libdrm_exynos)
+AC_SUBST(DRM_EXYNOS_CFLAGS)
+AC_SUBST(DRM_EXYNOS_LIBS)
 
 PKG_CHECK_MODULES(TBM, libtbm)
 AC_SUBST(TBM_CFLAGS)
@@ -194,7 +172,6 @@ dnl required package for evasimagesink/evaspixmapsink
 PKG_CHECK_MODULES(EFL, [
   evas >= $EFL_REQUIRED
   ecore >= $EFL_REQUIRED
-  ecore-x >= $EFL_REQUIRED
 ], [
   AC_SUBST(EFL_CFLAGS)
   AC_SUBST(EFL_LIBS)
@@ -243,6 +220,33 @@ AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
     X_LIBS="$X_LIBS -lX11"
     AC_SUBST(X_CFLAGS)
     AC_SUBST(X_LIBS)
+
+    dnl xvimagesrc _CFLAGS and _LIB available
+
+    PKG_CHECK_MODULES(DRI2, libdri2)
+    AC_SUBST(DRI2_CFLAGS)
+    AC_SUBST(DRI2_LIBS)
+
+    PKG_CHECK_MODULES(X11, x11)
+    AC_SUBST(X11_CFLAGS)
+    AC_SUBST(X11_LIBS)
+
+    PKG_CHECK_MODULES(XEXT, xext)
+    AC_SUBST(XEXT_CFLAGS)
+    AC_SUBST(XEXT_LIBS)
+
+    PKG_CHECK_MODULES(XV, xv)
+    AC_SUBST(XV_CFLAGS)
+    AC_SUBST(XV_LIBS)
+
+    PKG_CHECK_MODULES(XDAMAGE, xdamage)
+    AC_SUBST(XDAMAGE_CFLAGS)
+    AC_SUBST(XDAMAGE_LIBS)
+
+    PKG_CHECK_MODULES(ECORE_X, ecore-x)
+    AC_SUBST(ECORE_X_CFLAGS)
+    AC_SUBST(ECORE_X_LIBS)
+
   fi
   AC_SUBST(HAVE_X)
   CFLAGS="$ac_cflags_save"
@@ -284,76 +288,77 @@ dnl PKG_CHECK_MODULES(UDEVMGR, unified-dev-mgr)
 dnl AC_SUBST(UDEVMGR_CFLAGS)
 dnl AC_SUBST(UDEVMGR_LIBS)
 
-dnl use ext-encodebin --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-encodebin, AC_HELP_STRING([--enable-ext-encodebin], [using encodebin]),
+dnl use encodebin --------------------------------------------------------------------------
+AC_ARG_ENABLE(encodebin, AC_HELP_STRING([--enable-encodebin], [using encodebin]),
   [
     case "${enableval}" in
-      yes) GST_EXT_USE_EXT_ENCODEBIN=yes ;;
-      no)  GST_EXT_USE_EXT_ENCODEBIN=no ;;
-      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-encodebin) ;;
+      yes) GST_TIZEN_USE_ENCODEBIN=yes ;;
+      no)  GST_TIZEN_USE_ENCODEBIN=no ;;
+      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-encodebin) ;;
     esac
   ],
-  [GST_EXT_USE_EXT_ENCODEBIN=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_ENCODEBIN, test "x$GST_EXT_USE_EXT_ENCODEBIN" = "xyes")
+  [GST_TIZEN_USE_ENCODEBIN=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_ENCODEBIN, test "x$GST_TIZEN_USE_ENCODEBIN" = "xyes")
 
-dnl use ext-evasimagesink --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-evasimagesink, AC_HELP_STRING([--enable-ext-evasimagesink], [using evasimagesink]),
+dnl use evasimagesink --------------------------------------------------------------------------
+AC_ARG_ENABLE(evasimagesink, AC_HELP_STRING([--enable-evasimagesink], [using evasimagesink]),
   [
     case "${enableval}" in
-      yes) GST_EXT_USE_EXT_EVASIMAGESINK=yes ;;
-      no)  GST_EXT_USE_EXT_EVASIMAGESINK=no ;;
-      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-evasimagesink) ;;
+      yes) GST_TIZEN_USE_EVASIMAGESINK=yes ;;
+      no)  GST_TIZEN_USE_EVASIMAGESINK=no ;;
+      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-evasimagesink) ;;
     esac
   ],
-  [GST_EXT_USE_EXT_EVASIMAGESINK=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_EVASIMAGESINK, test "x$GST_EXT_USE_EXT_EVASIMAGESINK" = "xyes")
+  [GST_TIZEN_USE_EVASIMAGESINK=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_EVASIMAGESINK, test "x$GST_TIZEN_USE_EVASIMAGESINK" = "xyes")
 
 dnl use evaspixmapsink ---------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-evaspixmapsink, AC_HELP_STRING([--enable-ext-evaspixmapsink], [using evaspixmapsink]),
+AC_ARG_ENABLE(evaspixmapsink, AC_HELP_STRING([--enable-evaspixmapsink], [using evaspixmapsink]),
   [
     case "${enableval}" in
-      yes) GST_EXT_USE_EXT_EVASPIXMAPSINK=yes ;;
-      no)  GST_EXT_USE_EXT_EVASPIXMAPSINK=no ;;
-      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-evaspixmapsink) ;;
+      yes) GST_TIZEN_USE_EVASPIXMAPSINK=yes ;;
+      no)  GST_TIZEN_USE_EVASPIXMAPSINK=no ;;
+      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-evaspixmapsink) ;;
     esac
   ],
-  [GST_EXT_USE_EXT_EVASPIXMAPSINK=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_EVASPIXMAPSINK, test "x$GST_EXT_USE_EXT_EVASPIXMAPSINK" = "xyes")
+  [GST_TIZEN_USE_EVASPIXMAPSINK=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_EVASPIXMAPSINK, test "x$GST_TIZEN_USE_EVASPIXMAPSINK" = "xyes")
 
-dnl use ext-xvimagesrc--------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-xvimagesrc, AC_HELP_STRING([--enable-ext-xvimagesrc], [using xvimagesrc]),
+dnl use xvimagesrc--------------------------------------------------------------------------
+AC_ARG_ENABLE(xvimagesrc, AC_HELP_STRING([--enable-xvimagesrc], [using xvimagesrc]),
   [
     case "${enableval}" in
-      yes) GST_EXT_USE_EXT_XVIMAGESRC=yes ;;
-      no)  GST_EXT_USE_EXT_XVIMAGESRC=no ;;
-      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-xvimagesrc) ;;
+      yes) GST_TIZEN_USE_XVIMAGESRC=yes ;;
+      no)  GST_TIZEN_USE_XVIMAGESRC=no ;;
+      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-xvimagesrc) ;;
     esac
   ],
-  [GST_EXT_USE_EXT_XVIMAGESRC=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_XVIMAGESRC, test "x$GST_EXT_USE_EXT_XVIMAGESRC" = "xyes")
+  [GST_TIZEN_USE_XVIMAGESRC=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_XVIMAGESRC, test "x$GST_TIZEN_USE_XVIMAGESRC" = "xyes")
 
-dnl use ext-drmsrc --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-drmsrc, AC_HELP_STRING([--enable-ext-drmsrc], [using drmsrc]),
+dnl use drmsrc --------------------------------------------------------------------------
+AC_ARG_ENABLE(drmsrc, AC_HELP_STRING([--enable-drmsrc], [using drmsrc]),
   [
     case "${enableval}" in
-      yes) GST_EXT_USE_EXT_DRMSRC=yes ;;
-      no)  GST_EXT_USE_EXT_DRMSRC=no ;;
-      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-drmsrc) ;;
+      yes) GST_TIZEN_USE_DRMSRC=yes ;;
+      no)  GST_TIZEN_USE_DRMSRC=no ;;
+      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-drmsrc) ;;
     esac
   ],
-  [GST_EXT_USE_EXT_DRMSRC=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_DRMSRC, test "x$GST_EXT_USE_EXT_DRMSRC" = "xyes")
-dnl use ext-toggle --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-toggle, AC_HELP_STRING([--enable-ext-toggle], [using toggle]),
+  [GST_TIZEN_USE_DRMSRC=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_DRMSRC, test "x$GST_TIZEN_USE_DRMSRC" = "xyes")
+
+dnl use toggle --------------------------------------------------------------------------
+AC_ARG_ENABLE(toggle, AC_HELP_STRING([--enable-toggle], [using toggle]),
   [
     case "${enableval}" in
-      yes) GST_EXT_USE_EXT_TOGGLE=yes ;;
-      no)  GST_EXT_USE_EXT_TOGGLE=no ;;
-      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-toggle) ;;
+      yes) GST_TIZEN_USE_TOGGLE=yes ;;
+      no)  GST_TIZEN_USE_TOGGLE=no ;;
+      *)   AC_MSG_ERROR(bad value ${enableval} for --enable-toggle) ;;
     esac
   ],
-  [GST_EXT_USE_EXT_TOGGLE=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_TOGGLE, test "x$GST_EXT_USE_EXT_TOGGLE" = "xyes")
+  [GST_TIZEN_USE_TOGGLE=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_TOGGLE, test "x$GST_TIZEN_USE_TOGGLE" = "xyes")
 
 dnl for i386 --------------------------------------------------------------------------
 AC_ARG_ENABLE(i386, AC_HELP_STRING([--enable-i386], [i386 build]),
@@ -367,65 +372,67 @@ AC_ARG_ENABLE(i386, AC_HELP_STRING([--enable-i386], [i386 build]),
        [IS_I386=no])
 AM_CONDITIONAL([IS_I386], [test "x$IS_I386" = "xyes"])
 
-dnl use ext-pdpushsrc --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-pdpushsrc, AC_HELP_STRING([--enable-ext-pdpushsrc], [using pdpushsrc]),
+dnl use pdpushsrc --------------------------------------------------------------------------
+AC_ARG_ENABLE(pdpushsrc, AC_HELP_STRING([--enable-pdpushsrc], [using pdpushsrc]),
 [
  case "${enableval}" in
-        yes) GST_EXT_USE_EXT_PD_PUSHSRC=yes ;;
-        no)  GST_EXT_USE_EXT_PD_PUSHSRC=no ;;
-        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-pdpushsrc) ;;
+        yes) GST_TIZEN_USE_PD_PUSHSRC=yes ;;
+        no)  GST_TIZEN_USE_PD_PUSHSRC=no ;;
+        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-pdpushsrc) ;;
  esac
  ],
- [GST_EXT_USE_EXT_PD_PUSHSRC=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_PD_PUSHSRC, test "x$GST_EXT_USE_EXT_PD_PUSHSRC" = "xyes")
-dnl use ext-audiotp --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-audiotp, AC_HELP_STRING([--enable-ext-audiotp], [using audiotp]),
+ [GST_TIZEN_USE_PD_PUSHSRC=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_PD_PUSHSRC, test "x$GST_TIZEN_USE_PD_PUSHSRC" = "xyes")
+
+dnl use audiotp --------------------------------------------------------------------------
+AC_ARG_ENABLE(audiotp, AC_HELP_STRING([--enable-audiotp], [using audiotp]),
 [
  case "${enableval}" in
-        yes) GST_EXT_USE_EXT_AUDIOTP=yes ;;
-        no)  GST_EXT_USE_EXT_AUDIOTP=no ;;
-        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-audiotp) ;;
+        yes) GST_TIZEN_USE_AUDIOTP=yes ;;
+        no)  GST_TIZEN_USE_AUDIOTP=no ;;
+        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-audiotp) ;;
  esac
  ],
- [GST_EXT_USE_EXT_AUDIOTP=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_AUDIOTP, test "x$GST_EXT_USE_EXT_AUDIOTP" = "xyes")
+ [GST_TIZEN_USE_AUDIOTP=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_AUDIOTP, test "x$GST_TIZEN_USE_AUDIOTP" = "xyes")
 
-dnl use ext-audioeq --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-audioeq, AC_HELP_STRING([--enable-ext-audioeq], [using audioeq]),
+dnl use audioeq --------------------------------------------------------------------------
+AC_ARG_ENABLE(audioeq, AC_HELP_STRING([--enable-audioeq], [using audioeq]),
 [
  case "${enableval}" in
-         yes) GST_EXT_USE_EXT_AUDIOEQ=yes ;;
-         no)  GST_EXT_USE_EXT_AUDIOEQ=no ;;
-         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-audioeq) ;;
+         yes) GST_TIZEN_USE_AUDIOEQ=yes ;;
+         no)  GST_TIZEN_USE_AUDIOEQ=no ;;
+         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-audioeq) ;;
  esac
  ],
- [GST_EXT_USE_EXT_AUDIOEQ=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_AUDIOEQ, test "x$GST_EXT_USE_EXT_AUDIOEQ" = "xyes")
+ [GST_TIZEN_USE_AUDIOEQ=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_AUDIOEQ, test "x$GST_TIZEN_USE_AUDIOEQ" = "xyes")
 
-dnl use ext-fimcconvert ----------------------------------------------------------------------
-AC_ARG_ENABLE(ext-fimcconvert, AC_HELP_STRING([--enable-ext-fimcconvert], [using fimcconvert]),
+dnl use fimcconvert ----------------------------------------------------------------------
+AC_ARG_ENABLE(fimcconvert, AC_HELP_STRING([--enable-fimcconvert], [using fimcconvert]),
 [
  case "${enableval}" in
-         yes) GST_EXT_USE_EXT_FIMCCONVERT=yes ;;
-         no)  GST_EXT_USE_EXT_FIMCCONVERT=no ;;
-         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-fimcconvert) ;;
+         yes) GST_TIZEN_USE_FIMCCONVERT=yes ;;
+         no)  GST_TIZEN_USE_FIMCCONVERT=no ;;
+         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-fimcconvert) ;;
  esac
  ],
- [GST_EXT_USE_EXT_FIMCCONVERT=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_FIMCCONVERT, test "x$GST_EXT_USE_EXT_FIMCCONVERT" = "xyes")
+ [GST_TIZEN_USE_FIMCCONVERT=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_FIMCCONVERT, test "x$GST_TIZEN_USE_FIMCCONVERT" = "xyes")
 
-dnl use ext-wfdrtspsrc --------------------------------------------------------------------------
-AC_ARG_ENABLE(ext-wfdrtspsrc, AC_HELP_STRING([--enable-ext-wfdrtspsrc], [using wfdrtspsrc]),
+dnl use wfdrtspsrc --------------------------------------------------------------------------
+AC_ARG_ENABLE(wfdrtspsrc, AC_HELP_STRING([--enable-wfdrtspsrc], [using wfdrtspsrc]),
 [
  case "${enableval}" in
-  yes) GST_EXT_USE_EXT_WFDRTSPSRC=yes ;;
-  no)  GST_EXT_USE_EXT_WFDRTSPSRC=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for --enable-ext-wfdrtspsrc) ;;
+  yes) GST_TIZEN_USE_WFDRTSPSRC=yes ;;
+  no)  GST_TIZEN_USE_WFDRTSPSRC=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for --enable-wfdrtspsrc) ;;
  esac
  ],
- [GST_EXT_USE_EXT_WFDRTSPSRC=yes])
-AM_CONDITIONAL(GST_EXT_USE_EXT_WFDRTSPSRC, test "x$GST_EXT_USE_EXT_WFDRTSPSRC" = "xyes")
-dnl if [test "x$GST_EXT_USE_EXT_WFDRTSPSRC" = "xyes"];
+ [GST_TIZEN_USE_WFDRTSPSRC=yes])
+AM_CONDITIONAL(GST_TIZEN_USE_WFDRTSPSRC, test "x$GST_TIZEN_USE_WFDRTSPSRC" = "xyes")
+
+dnl if [test "x$GST_TIZEN_USE_WFDRTSPSRC" = "xyes"];
 dnl then
 dnl PKG_CHECK_MODULES(MM_WFD_COMMON, mm-scmirroring-common)
 dnl AC_SUBST(MM_WFD_COMMON_CFLAGS)
@@ -458,3 +465,4 @@ fimcconvert/src/Makefile
 dnl wfdrtspsrc/Makefile
 dnl wfdrtspsrc/src/Makefile
 )
+

diff --git a/encodebin/src/gstencodebin.c b/encodebin/src/gstencodebin.c
index f37aa75..ff7aa18 100644 (file)
--- a/encodebin/src/gstencodebin.c
+++ b/encodebin/src/gstencodebin.c
@@ -273,7 +273,6 @@ static gboolean gst_encode_bin_init_image_elements (GstElement *element, gpointe
 static gboolean gst_encode_bin_block(GstEncodeBin *encodebin, gboolean value);
 static gboolean gst_encode_bin_pause(GstEncodeBin *encodebin, gboolean value);
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-static gboolean gst_encode_bin_release_pipeline (GstElement *element, gpointer user_data);
 static GstPad* gst_encode_bin_get_mux_sink_pad(GstElement *mux, GstEncodeBinMuxSinkPad type);
 
 //Data probe
@@ -932,11 +931,9 @@ gst_encode_bin_class_init (GstEncodeBinClass *klass)
 {
        GObjectClass *gobject_klass;
        GstElementClass *gstelement_klass;
-       GstBinClass *gstbin_klass;
 
        gobject_klass = (GObjectClass *) klass;
        gstelement_klass = (GstElementClass *) klass;
-       gstbin_klass = (GstBinClass *) klass;
        
        parent_class = g_type_class_peek_parent (klass);
 
@@ -1103,8 +1100,6 @@ gst_encode_bin_class_init (GstEncodeBinClass *klass)
 static void
 gst_encode_bin_init (GstEncodeBin *encodebin)
 {
-       encodebin->mutex = g_mutex_new();
-
        if (encodebin->srcpad == NULL) {
                encodebin->srcpad = gst_ghost_pad_new_no_target ("src", GST_PAD_SRC);
                gst_element_add_pad (GST_ELEMENT(encodebin), encodebin->srcpad);
@@ -1242,10 +1237,6 @@ gst_encode_bin_dispose (GObject * object)
 static void
 gst_encode_bin_finalize (GObject * object)
 {
-       GstEncodeBin *encodebin = GST_ENCODE_BIN (object);
-
-       g_mutex_free (encodebin->mutex);
-
        G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -1295,18 +1286,9 @@ gst_encode_bin_change_state (GstElement * element, GstStateChange transition)
 }
 
 static void
-gst_encode_bin_release_all_pads (GstEncodeBin *encodebin)
-{
-       gst_element_remove_pad(GST_ELEMENT(encodebin), encodebin->video_sinkpad);
-       gst_element_remove_pad(GST_ELEMENT(encodebin), encodebin->audio_sinkpad);
-       gst_element_remove_pad(GST_ELEMENT(encodebin), encodebin->image_sinkpad);
-}
-
-static void
 gst_encode_bin_release_pad (GstElement * element, GstPad * pad)
 {
        GstEncodeBin *encodebin = GST_ENCODE_BIN (element);
-       GstPad *muxpad = NULL;
        
        if(!pad_compare_name(pad, "video")) {
 #if 0          
@@ -1362,7 +1344,6 @@ gst_encode_bin_release_pad (GstElement * element, GstPad * pad)
 
                encodebin->mux_audio_sinkpad;
                gst_element_release_request_pad(encodebin->mux, encodebin->mux_audio_sinkpad);
-               muxpad = NULL;
 
                if(encodebin->mux_video_sinkpad == NULL) {
                        gst_encode_bin_remove_element(encodebin, encodebin->mux);
@@ -2222,7 +2203,7 @@ image_link_fail:
 static gboolean 
 gst_encode_bin_unlink_elements (GstEncodeBin *encodebin)
 {
-       GstPad *pad = NULL, *muxpad = NULL;
+       GstPad *pad = NULL;
        
        switch(encodebin->profile) {
                case GST_ENCODE_BIN_PROFILE_AV :
@@ -2266,22 +2247,6 @@ gst_encode_bin_unlink_elements (GstEncodeBin *encodebin)
 
                        if(encodebin->mux_video_sinkpad != NULL)
                        {
-#if 0                  
-                               if(encodebin->use_venc_queue)
-                               {
-                                       gst_element_unlink(encodebin->video_encode, encodebin->video_encode_queue);
-
-                                       pad = gst_element_get_static_pad (encodebin->video_encode_queue, "src");
-                                       gst_pad_unlink(pad, muxpad);
-                                       gst_object_unref(pad);
-                                       pad = NULL;
-
-                                       if ( g_signal_handler_is_connected ( encodebin->video_encode_queue, encodebin->veque_sig_id) )
-                                       {
-                                               g_signal_handler_disconnect (  encodebin->video_encode_queue, encodebin->veque_sig_id );
-                                       }
-                               }
-#else
                                if(encodebin->video_encode_queue)
                                {
                                        gst_element_unlink(encodebin->video_encode, encodebin->video_encode_queue);
@@ -2296,7 +2261,6 @@ gst_encode_bin_unlink_elements (GstEncodeBin *encodebin)
                                                g_signal_handler_disconnect (  encodebin->video_encode_queue, encodebin->veque_sig_id );
                                        }
                                }
-#endif
                                else
                                {
                                        pad = gst_element_get_static_pad (encodebin->video_encode, "src");
@@ -2778,7 +2742,8 @@ static gboolean gst_encode_bin_pause(GstEncodeBin *encodebin, gboolean value)
                if (encodebin->paused_time == 0)
                {
                        //get steam time
-                       if (clock = GST_ELEMENT_CLOCK(encodebin))               //before PLAYING, this would be NULL. Need to check.
+                       clock = GST_ELEMENT_CLOCK(encodebin);
+                       if (clock)              //before PLAYING, this would be NULL. Need to check.
                        {
                                GstClockTime current_time, base_time;
 
@@ -2806,7 +2771,8 @@ static gboolean gst_encode_bin_pause(GstEncodeBin *encodebin, gboolean value)
                /* release paused-stream*/
                if (encodebin->paused_time != 0)
                {
-                       if (clock = GST_ELEMENT_CLOCK(encodebin))
+                       clock = GST_ELEMENT_CLOCK(encodebin);
+                       if (clock)
                        {
                                GstClockTime current_time, base_time;
                                GstClockTime paused_gap;
@@ -2860,52 +2826,6 @@ resume_fail:
        return FALSE;   
 }
 
-static gboolean
-gst_encode_bin_release_pipeline (GstElement *element,
-      gpointer user_data)
-{
-#if 0
-  GstEncodeBin *encodebin = GST_ENCODE_BIN (element);
-
-  gst_element_set_state (encodebin->audio_queue, GST_STATE_NULL);
-  gst_element_set_state (encodebin->audio_encode, GST_STATE_NULL);
-  gst_element_set_state (encodebin->video_queue, GST_STATE_NULL);
-  gst_element_set_state (encodebin->video_encode, GST_STATE_NULL);
-  gst_element_set_state (encodebin->mux, GST_STATE_NULL);
-
-  if (encodebin->auto_video_scale) {
-    gst_element_set_state (encodebin->video_scale, GST_STATE_NULL);
-    gst_element_unlink (encodebin->video_queue, encodebin->video_scale);
-    gst_element_unlink (encodebin->video_scale, encodebin->video_encode);
-    gst_bin_remove (GST_BIN (element), encodebin->video_scale);
-
-    encodebin->video_scale = NULL;
-  } else {
-    gst_element_unlink (encodebin->video_queue, encodebin->video_encode);
-  }
-
-  gst_pad_unlink (gst_element_get_pad (encodebin->audio_encode, "src"), 
-                       encodebin->mux_audio_sinkpad);
-  gst_pad_unlink (gst_element_get_pad (encodebin->video_encode, "src"), 
-                       encodebin->mux_video_sinkpad);
-
-  gst_bin_remove_many (GST_BIN (element),
-                               encodebin->audio_queue,
-                               encodebin->audio_encode,
-                               encodebin->video_queue,
-                               encodebin->video_encode,
-                               encodebin->mux,
-                               NULL);
-
-  encodebin->audio_queue = NULL;
-  encodebin->audio_encode = NULL;
-  encodebin->video_queue = NULL;
-  encodebin->video_encode = NULL;
-  encodebin->mux = NULL;
-#endif
-  return TRUE;
-}
-
 static GstPadProbeReturn
 gst_encode_bin_video_probe(GstPad *pad, GstPadProbeInfo *info, GstEncodeBin *encodebin)
 {

diff --git a/encodebin/src/gstencodebin.h b/encodebin/src/gstencodebin.h
index 136fc92..899e5b7 100644 (file)
--- a/encodebin/src/gstencodebin.h
+++ b/encodebin/src/gstencodebin.h
@@ -66,8 +66,6 @@ struct _GstEncodeBin
 {
   GstBin bin;                   /* we extend GstBin */
 
-  GMutex *mutex;
-
   /* pads */
   GstPad *srcpad;
   GstPad *video_sinkpad;

diff --git a/evasimagesink/src/Makefile.am b/evasimagesink/src/Makefile.am
index 54a752d..239a0c6 100644 (file)
--- a/evasimagesink/src/Makefile.am
+++ b/evasimagesink/src/Makefile.am
@@ -17,8 +17,8 @@ plugin_LTLIBRARIES = libgstevasimagesink.la
 libgstevasimagesink_la_SOURCES = gstevasimagesink.c gstevasimagesink.h
 
 # compiler and linker flags used to compile this plugin, set in configure.ac
-libgstevasimagesink_la_CFLAGS = $(GST_CFLAGS) $(GST_VIDEO_CFLAGS) $(EFL_CFLAGS) $(TBM_CFLAGS)
-libgstevasimagesink_la_LIBADD = $(GST_LIBS) $(GST_VIDEO_LIBS) $(EFL_LIBS) $(TBM_LIBS)
+libgstevasimagesink_la_CFLAGS = $(GST_CFLAGS) $(GST_VIDEO_CFLAGS) $(EFL_CFLAGS) $(TBM_CFLAGS) $(ECORE_X_CFLAGS)
+libgstevasimagesink_la_LIBADD = $(GST_LIBS) $(GST_VIDEO_LIBS) $(EFL_LIBS) $(TBM_LIBS) $(ECORE_X_LIBS)
 libgstevasimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstevasimagesink_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/evasimagesink/src/gstevasimagesink.c b/evasimagesink/src/gstevasimagesink.c
index 39f39ed..b7336f9 100755 (executable)
--- a/evasimagesink/src/gstevasimagesink.c
+++ b/evasimagesink/src/gstevasimagesink.c
@@ -36,7 +36,6 @@
 #include <gst/video/gstvideosink.h>
 #include <Evas.h>
 #include <Ecore.h>
-#include <Ecore_X.h>
 
 #include "gstevasimagesink.h"
 

diff --git a/packaging/gst-plugins-tizen.spec b/packaging/gst-plugins-tizen.spec
index 644e99d..5141cc0 100644 (file)
--- a/packaging/gst-plugins-tizen.spec
+++ b/packaging/gst-plugins-tizen.spec
@@ -1,32 +1,37 @@
-Name:       gst-plugins-tizen1.0
-Version:    0.1.0
+%bcond_with x
+%define gst_branch 1.0
+
+Name:       gst-plugins-tizen
+Version:    1.0.0
 Summary:    GStreamer tizen plugins (common)
-Release:    2
+Release:    0
 Group:      Multimedia/Framework
 Url:        http://gstreamer.freedesktop.org/
 License:    LGPL-2.0+
 Source0:    %{name}-%{version}.tar.gz
-%define gst_branch 1.0
 
 #BuildRequires:  pkgconfig(camsrcjpegenc)
 BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(gstreamer-audio-1.0)
 BuildRequires:  pkgconfig(gstreamer-video-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-1.0)  
 BuildRequires:  pkgconfig(libexif)
+%if %{with x}
+BuildRequires:  pkgconfig(ecore-x)
 BuildRequires: pkgconfig(libdri2)
 BuildRequires: pkgconfig(x11)
 BuildRequires: pkgconfig(xext)
 BuildRequires: pkgconfig(xv)
 BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(dri2proto)
+%endif
 BuildRequires: pkgconfig(libdrm)
+BuildRequires: pkgconfig(libdrm_exynos)
 BuildRequires:  pkgconfig(libtbm)
 BuildRequires: libdrm-devel
-BuildRequires: pkgconfig(dri2proto)
-BuildRequires: pkgconfig(xfixes)
 BuildRequires:  pkgconfig(vconf)
 #BuildRequires:  pkgconfig(mm-scmirroring-common)
 
@@ -41,7 +46,12 @@ GStreamer tizen plugins (common)
 export CFLAGS+=" -DGST_EXT_TIME_ANALYSIS -DGST_EXT_XV_ENHANCEMENT -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
 
 ./autogen.sh --disable-static
-%configure --disable-static
+%configure \
+%if %{with x}
+%else
+       --disable-xvimagesrc\
+%endif
+       --disable-static
 
 make %{?jobs:-j%jobs}
 
@@ -54,3 +64,4 @@ rm -rf %{buildroot}
 %manifest gst-plugins-tizen1.0.manifest
 %defattr(-,root,root,-)  
 %{_libdir}/gstreamer-%{gst_branch}/*.so
+

diff --git a/xvimagesrc/src/Makefile.am b/xvimagesrc/src/Makefile.am
index d37cedb..57ca553 100644 (file)
--- a/xvimagesrc/src/Makefile.am
+++ b/xvimagesrc/src/Makefile.am
@@ -18,8 +18,8 @@ libgstxvimagesrc_la_SOURCES = gstxvimagesrc.c
 
 # flags used to compile this plugin
 # add other _CFLAGS and _LIBS as needed
-libgstxvimagesrc_la_CFLAGS = $(GST_CFLAGS)  $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(TBM_CFLAGS) $(DRI2_CFLAGS) $(X11_CFLAGS) $(XEXT_CFLAGS) $(XV_CFLAGS) $(XDAMAGE_CFLAGS) $(DRM_DEVEL_CFLAGS) $(DRM_CFLAGS)
-libgstxvimagesrc_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(TBM_LIBS)$(DRI2_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XV_LIBS) $(XDAMAGE_LIBS) $(DRM_LIBS) $(DRM_DEVEL_LIBS)
+libgstxvimagesrc_la_CFLAGS = $(GST_CFLAGS)  $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(TBM_CFLAGS) $(DRI2_CFLAGS) $(X11_CFLAGS) $(XEXT_CFLAGS) $(XV_CFLAGS) $(XDAMAGE_CFLAGS) $(DRM_CFLAGS) $(DRM_EXYNOS_CFLAGS)
+libgstxvimagesrc_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(TBM_LIBS)$(DRI2_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XV_LIBS) $(XDAMAGE_LIBS) $(DRM_LIBS) $(DRM_EXYNOS_LIBS)
 libgstxvimagesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 # headers we need but don't want installed

diff --git a/xvimagesrc/src/gstxvimagesrc.c b/xvimagesrc/src/gstxvimagesrc.c
index fcc2d04..95029b1 100644 (file)
--- a/xvimagesrc/src/gstxvimagesrc.c
+++ b/xvimagesrc/src/gstxvimagesrc.c
@@ -638,7 +638,9 @@ drm_convert_gem_to_fd (int *gemname_cnt, int drm_fd, unsigned int name,
 
     struct drm_prime_handle prime;
     struct drm_gem_open gem_open;
+    /* TODO: drm_exynos_gem_mmap was removed. It can be replaced with drm_mode_map_dumb.
     struct drm_exynos_gem_mmap gem_mmap;        //for virtual address
+    */
 
     memset (&gem_open, 0, sizeof (struct drm_gem_open));
     gem_open.name = name;
@@ -659,20 +661,28 @@ drm_convert_gem_to_fd (int *gemname_cnt, int drm_fd, unsigned int name,
     /*get virtual address */
     /*set name */
     xv_gem_mmap->name[count] = name;
+    /* TODO: drm_exynos_gem_mmap was removed. It can be replaced with drm_mode_map_dumb.
     memset (&gem_mmap, 0, sizeof (struct drm_exynos_gem_mmap));
     gem_mmap.handle = prime.handle;
     gem_mmap.size = gem_open.size;
+    */
 
     /*set size */
+    /* TODO: drm_exynos_gem_mmap was removed. It can be replaced with drm_mode_map_dumb.
     xv_gem_mmap->buffer_size[count] = gem_mmap.size;
+    */
+    /* TODO: DRM_IOCTL_EXYNOS_GEM_MMAP was removed. It can be replaced with drm_mmap.
     if (drmIoctl (drm_fd, DRM_IOCTL_EXYNOS_GEM_MMAP, &gem_mmap) != 0) {
       GST_ERROR ("Gem mmap failed [handle %d, size %lld]", gem_mmap.handle,
           gem_mmap.size);
       return 0;
     }
+    */
 
     /*set virtual address */
+    /* TODO: drm_exynos_gem_mmap was removed. It can be replaced with drm_mode_map_dumb.
     xv_gem_mmap->address[count] = (void *) (gem_mmap.mapped);
+    */
     GST_DEBUG ("%u - Virtual address[%d] = %p size=%d ", name, count,
         xv_gem_mmap->address[count], xv_gem_mmap->buffer_size[count]);