[Cmake] delete dlog

delete dlog and tizen definition.
related issue : #807

TODO : determine log level defined in common header

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1398e80..d8cfdaf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 PROJECT(nnstreamer C CXX)
 
-OPTION(TIZEN "Enable Tizen build mode" OFF)
 OPTION(ENABLE_TENSORFLOW_LITE "Enable tensorflow-lite support" ON)
 OPTION(ENABLE_TENSORFLOW "Enable tensorflow support" OFF)
 OPTION(ENABLE_MODEL_DOWNLOAD "Enable download the model files" ON)
@@ -46,12 +45,6 @@ SET(PKG_MODULES
        glib-2.0
 )
 
-IF(TIZEN)
-       ADD_DEFINITIONS(-DTIZEN=1)
-       # Enable dlog of Tizen.
-       SET(PKG_MODULES ${PKG_MODULES} dlog)
-ENDIF(TIZEN)
-
 pkg_check_modules(pkgs REQUIRED ${PKG_MODULES})
 
 INCLUDE_DIRECTORIES(

diff --git a/gst/nnstreamer/tensor_common.h b/gst/nnstreamer/tensor_common.h
index d1e4734..e9f26a5 100644 (file)
--- a/gst/nnstreamer/tensor_common.h
+++ b/gst/nnstreamer/tensor_common.h
@@ -396,30 +396,23 @@ extern size_t get_tensor_element_count (const tensor_dim dim);
 #define str(s) xstr(s)
 #define xstr(s) #s
 
-#include <glib/gprintf.h>
-#ifdef TIZEN
-#include <dlog.h>
-#else
-#define dlog_print(loglevel, component, ...) \
-  do { \
-    g_message(__VA_ARGS__); \
-  } while (0)
-#endif
-
 /**
- * @brief Debug message print. In Tizen, it uses dlog; otherwise,m it uses g_message().
+ * @brief Debug message print.
  */
-#define debug_print(cond, ...) \
+#define debug_print(cond,...) \
   do { \
     if ((cond) == TRUE) { \
-      dlog_print(DLOG_DEBUG, "nnstreamer", __FILE__ ":" str(__LINE__) " "  __VA_ARGS__); \
+      g_message (__FILE__ ":" str(__LINE__) " "  __VA_ARGS__); \
     } \
   } while (0)
 
 /**
- * @brief Error message print. In Tizen, it uses dlog; otherwise,m it uses g_message().
+ * @brief Error message print.
  */
-#define err_print(...) dlog_print(DLOG_ERROR, "nnstreamer", __VA_ARGS__)
+#define err_print(...) \
+  do { \
+    g_warning (__FILE__ ":" str(__LINE__) " " __VA_ARGS__); \
+  } while (0)
 
 /**
  * @brief A callback for typefind, trying to find whether a file is other/tensors or not.

diff --git a/nnstreamer_example/CMakeLists.txt b/nnstreamer_example/CMakeLists.txt
index 793ac8f..fe0cce9 100644 (file)
--- a/nnstreamer_example/CMakeLists.txt
+++ b/nnstreamer_example/CMakeLists.txt
@@ -5,6 +5,7 @@ SET(PKGAPP_MODULES
        gstreamer-base-1.0
        gstreamer-controller-1.0
        gstreamer-video-1.0
+       gstreamer-audio-1.0
        gstreamer-app-1.0
 )
 pkg_check_modules(apppkgs REQUIRED ${PKGAPP_MODULES})

diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index 829f0e4..85d9239 100644 (file)
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -15,12 +15,10 @@ Source0:    nnstreamer-%{version}.tar.gz
 Source1001:    nnstreamer.manifest
 
 Requires:      gstreamer >= 1.8.0
-Requires:      libdlog
 BuildRequires: gstreamer-devel
 BuildRequires: gst-plugins-base-devel
 BuildRequires: glib2-devel
 BuildRequires: cmake
-BuildRequires: libdlog-devel
 
 # To run test cases, we need gst plugins
 BuildRequires: gst-plugins-good
@@ -91,7 +89,7 @@ mkdir -p build
 pushd build
 export GST_PLUGIN_PATH=$(pwd)
 export LD_LIBRARY_PATH=$(pwd):$(pwd)/gst/tensor_filter
-%cmake .. -DTIZEN=ON -DGST_INSTALL_DIR=%{gstlibdir} -DENABLE_MODEL_DOWNLOAD=OFF
+%cmake .. -DGST_INSTALL_DIR=%{gstlibdir} -DENABLE_MODEL_DOWNLOAD=OFF
 make %{?_smp_mflags}
 ./tests/unittest_common
 ./tests/unittest_sink --gst-plugin-path=.

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6ce303b..a4a638d 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,19 +7,19 @@ SET(PKGTEST_MODULES
 
 FIND_LIBRARY(GTEST_LIB gtest)
 
-IF(TIZEN OR GTEST_LIB)
-       # Use GTEST shared lib (Tizen supplied gtest as shared lib)
+IF(GTEST_LIB)
+       # Use GTEST shared lib
        SET(gtestLink gtest pthread)
        SET(gtestSrc "")
        SET(gtestInc "")
-ELSE(TIZEN OR GTEST_LIB)
+ELSE(GTEST_LIB)
        IF (NOT EXISTS /usr/src/gtest/src/gtest-all.cc)
                MESSAGE(FATAL FATAL_ERROR "You need to install libgtest-dev or (supplied with GTEST_LIB) libgtest.so.")
        ENDIF ()
        SET(gtestLink pthread)
        SET(gtestSrc /usr/src/gtest/src/gtest-all.cc)
        SET(gtestInc /usr/src/gtest)
-ENDIF(TIZEN OR GTEST_LIB)
+ENDIF(GTEST_LIB)
 
 pkg_check_modules(testpkgs REQUIRED ${PKGTEST_MODULES})