[Test] change the flag to print logs

Set default debug flag to false. The examples will not print messages.

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

diff --git a/nnstreamer_example/example_cam/nnstreamer_example_cam.c b/nnstreamer_example/example_cam/nnstreamer_example_cam.c
index a0c16ca..67ebb6c 100644 (file)
--- a/nnstreamer_example/example_cam/nnstreamer_example_cam.c
+++ b/nnstreamer_example/example_cam/nnstreamer_example_cam.c
@@ -22,7 +22,7 @@
  * @brief Macro for debug mode.
  */
 #ifndef DBG
-#define DBG TRUE
+#define DBG FALSE
 #endif
 
 /**

diff --git a/nnstreamer_example/example_decoder_image_labelling/nnstreamer_example_decoder_image_labelling.c b/nnstreamer_example/example_decoder_image_labelling/nnstreamer_example_decoder_image_labelling.c
index 40cd745..19d93c9 100644 (file)
--- a/nnstreamer_example/example_decoder_image_labelling/nnstreamer_example_decoder_image_labelling.c
+++ b/nnstreamer_example/example_decoder_image_labelling/nnstreamer_example_decoder_image_labelling.c
@@ -2,7 +2,7 @@
  * @file       nnstreamer_example_decoder.c
  * @date       4 Oct 2018
  * @brief      Tensor stream example with tensor decoder
- * @see        https://github.com/nnsuite/nnstreamer   
+ * @see        https://github.com/nnsuite/nnstreamer
  * @author     Jinhyuck Park <jinhyuck83.park@samsung.com>
  * @bug                No known bugs.
  *
@@ -11,7 +11,7 @@
  * Pipeline :
  * v4l2src -- tee --  -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- textoverlay -- videoconvert -- ximagesink
  *                  |                                                                    |
- *                  --- videoscale -- tensor_converter -- tensor_filter -- tensor_decoder 
+ *                  --- videoscale -- tensor_converter -- tensor_filter -- tensor_decoder
  *
  *
  * 'tensor_filter' for image recognition.
@@ -40,7 +40,7 @@
  * @brief Macro for debug mode.
  */
 #ifndef DBG
-#define DBG TRUE
+#define DBG FALSE
 #endif
 
 /**

diff --git a/nnstreamer_example/example_filter/nnstreamer_example_filter.c b/nnstreamer_example/example_filter/nnstreamer_example_filter.c
index 491a55d..207381e 100644 (file)
--- a/nnstreamer_example/example_filter/nnstreamer_example_filter.c
+++ b/nnstreamer_example/example_filter/nnstreamer_example_filter.c
@@ -40,7 +40,7 @@
  * @brief Macro for debug mode.
  */
 #ifndef DBG
-#define DBG TRUE
+#define DBG FALSE
 #endif
 
 /**

diff --git a/nnstreamer_example/example_filter/nnstreamer_example_filter.py b/nnstreamer_example/example_filter/nnstreamer_example_filter.py
index 0b51296..19aa447 100644 (file)
--- a/nnstreamer_example/example_filter/nnstreamer_example_filter.py
+++ b/nnstreamer_example/example_filter/nnstreamer_example_filter.py
@@ -33,7 +33,9 @@ See https://lazka.github.io/pgi-docs/#Gst-1.0 for Gst API details.
 
 import os
 import sys
+import logging
 import gi
+
 gi.require_version('Gst', '1.0')
 from gi.repository import Gst, GObject
 
@@ -45,7 +47,6 @@ class NNStreamerExample:
         self.loop = None
         self.pipeline = None
         self.running = False
-        self.received = 0
         self.current_label_index = -1
         self.new_label_index = -1
         self.tflite_model = ''
@@ -112,20 +113,21 @@ class NNStreamerExample:
         :return: None
         """
         if message.type == Gst.MessageType.EOS:
-            print('received eos message')
+            logging.info('received eos message')
             self.loop.quit()
         elif message.type == Gst.MessageType.ERROR:
             error, debug = message.parse_error()
-            print('[error]', error, debug)
+            logging.warning('[error] %s : %s', error.message, debug)
             self.loop.quit()
         elif message.type == Gst.MessageType.WARNING:
             error, debug = message.parse_warning()
-            print('[warning]', error, debug)
+            logging.warning('[warning] %s : %s', error.message, debug)
         elif message.type == Gst.MessageType.STREAM_START:
-            print('received start message')
+            logging.info('received start message')
         elif message.type == Gst.MessageType.QOS:
             data_format, processed, dropped = message.parse_qos_stats()
-            print('[qos]', data_format, processed, dropped)
+            format_str = Gst.Format.get_name(data_format)
+            logging.debug('[qos] format[%s] processed[%d] dropped[%d]', format_str, processed, dropped)
 
     def on_new_data(self, sink, buffer):
         """Callback for tensor sink signal.
@@ -134,10 +136,6 @@ class NNStreamerExample:
         :param buffer: buffer from element
         :return: None
         """
-        # print progress
-        self.received += 1
-        print('receiving new data:', self.received)
-
         if self.running:
             for idx in range(buffer.n_memory()):
                 mem = buffer.peek_memory(idx)
@@ -189,7 +187,7 @@ class NNStreamerExample:
         # check model file exists
         self.tflite_model = os.path.join(model_folder, tflite_model)
         if not os.path.exists(self.tflite_model):
-            print('cannot find tflite model:', self.tflite_model)
+            logging.error('cannot find tflite model [%s]', self.tflite_model)
             return False
 
         # load labels
@@ -199,10 +197,10 @@ class NNStreamerExample:
                 for line in label_file.readlines():
                     self.tflite_labels.append(line)
         except FileNotFoundError:
-            print('cannot find tflite label:', label_path)
+            logging.error('cannot find tflite label [%s]', label_path)
             return False
 
-        print('finished to load labels, total:', len(self.tflite_labels))
+        logging.info('finished to load labels, total [%d]', len(self.tflite_labels))
         return True
 
     def tflite_get_label(self, index):
@@ -233,7 +231,7 @@ class NNStreamerExample:
             if max_score > 0:
                 self.new_label_index = scores.index(max_score)
         else:
-            print('unexpected data size:', data_size)
+            logging.error('unexpected data size [%d]', data_size)
 
 
 if __name__ == '__main__':

diff --git a/nnstreamer_example/example_object_detection/nnstreamer_example_object_detection.cc b/nnstreamer_example/example_object_detection/nnstreamer_example_object_detection.cc
index 6e4ce43..1026f58 100644 (file)
--- a/nnstreamer_example/example_object_detection/nnstreamer_example_object_detection.cc
+++ b/nnstreamer_example/example_object_detection/nnstreamer_example_object_detection.cc
@@ -9,10 +9,10 @@
  * Before running this example, GST_PLUGIN_PATH should be updated for nnstreamer plug-in.
  * $ export GST_PLUGIN_PATH=$GST_PLUGIN_PATH:<nnstreamer plugin path>
  * $ ./nnstreamer_example_object_detection
-* 
+ *
  * Required model and resources are stored at below link
  * https://github.com/nnsuite/testcases/tree/master/DeepLearningModels/tensorflow-lite/ssd_mobilenet_v2_coco
-  */
+ */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE

diff --git a/nnstreamer_example/example_sink/nnstreamer_sink_example.c b/nnstreamer_example/example_sink/nnstreamer_sink_example.c
index fdc944b..6ab1440 100644 (file)
--- a/nnstreamer_example/example_sink/nnstreamer_sink_example.c
+++ b/nnstreamer_example/example_sink/nnstreamer_sink_example.c
@@ -23,7 +23,7 @@
  * @brief Macro for debug mode.
  */
 #ifndef DBG
-#define DBG TRUE
+#define DBG FALSE
 #endif
 
 /**

diff --git a/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c b/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c
index e806818..5840aff 100644 (file)
--- a/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c
+++ b/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c
@@ -24,7 +24,7 @@
  * @brief Macro for debug mode.
  */
 #ifndef DBG
-#define DBG TRUE
+#define DBG FALSE
 #endif
 
 /**