[Mux/Merge] change property name

change property name (sync mode and option), remove underbar in property name.

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

diff --git a/Documentation/synchronization-policies-at-mux-merge.md b/Documentation/synchronization-policies-at-mux-merge.md
index 9bb6d52..2201f94 100644 (file)
--- a/Documentation/synchronization-policies-at-mux-merge.md
+++ b/Documentation/synchronization-policies-at-mux-merge.md
@@ -30,7 +30,7 @@ For the case of merge/mux element which has three pads with different framerate
 \r
 # Slowest\r
 \r
-"Slowest" policy (sync_mode=slowest) synchronize tensors based on slowest timestamp among pads.  \r
+"Slowest" policy (sync-mode=slowest) synchronize tensors based on slowest timestamp among pads.  \r
 Finding slowest timestamp among pads and used as base timestamp. It drops buffers which is earlier than this base timestamp. However if the difference with timestamp of previous buffer is smaller than with current buffer, then previous buffer is used.  \r
 For the case of three pad with different framerates, It merged/muxed\r
 \r
@@ -46,9 +46,9 @@ As you can see, second and third buffers of srcpad0 are dropped. Because it is s
 \r
 # BasePad\r
 \r
-With "Base Pad", Base timestamp is decided with designated pad which is given by user with sync_option.  \r
-Sync_option consists of two variables and first denotes the base pad number and second is duration in nanoseconds ( as a GstClockTime ). In this policy, every buffer which has pts is within duration from base time stamp is merged/muxed. For the case of buffer with greater pts than base timestamp plus duration, previous buffer is going to used instead.  \r
-Test case with "sync_mode=basepad sync_option=0:33333333" is below,\r
+With "Base Pad", Base timestamp is decided with designated pad which is given by user with sync-option.  \r
+Sync option consists of two variables and first denotes the base pad number and second is duration in nanoseconds ( as a GstClockTime ). In this policy, every buffer which has pts is within duration from base time stamp is merged/muxed. For the case of buffer with greater pts than base timestamp plus duration, previous buffer is going to used instead.  \r
+Test case with "sync-mode=basepad sync-option=0:33333333" is below,\r
 \r
 ```\r
     *srcpad0        srcpad1         srcpad2\r
@@ -71,7 +71,7 @@ The base timestamp is 0, so that every buffer of srcpad0 is pushed to downstream
 The other is "Refresh" policy. The Base timestamp is decided with the pad which receives a new buffer.  \r
 The above 3 policies require all pads are collected state. It means all of the sinkpads of `tensor_mux` have to be filled. However, with "Refresh", `tensor_mux` pushes the buffers to srcpad when each sinkpad receives a new buffer. For the sinkpads which not received the new buffer will use again the previous one.  \r
 \r
-Test case with "sync_mode=refresh" is below,\r
+Test case with "sync-mode=refresh" is below,\r
 \r
 ```\r
     sinkpad0         sinkpad1         sinkpad2\r

diff --git a/gst/nnstreamer/tensor_common.h b/gst/nnstreamer/tensor_common.h
index faf4874..08e9617 100644 (file)
--- a/gst/nnstreamer/tensor_common.h
+++ b/gst/nnstreamer/tensor_common.h
@@ -126,7 +126,7 @@ gst_tensor_time_sync_get_mode_string (tensor_time_sync_mode mode);
 
 /**
  * @brief Setup time sync option.
- * @param[in/out] filter "this" pointer. sync_mode & option MUST BE set already.
+ * @param[in/out] filter "this" pointer. Sync mode & option MUST BE set already.
  * @return True if successfully set the option.
  */
 extern gboolean

diff --git a/gst/nnstreamer/tensor_common_pipeline.c b/gst/nnstreamer/tensor_common_pipeline.c
index fe3ebc6..9dddccf 100644 (file)
--- a/gst/nnstreamer/tensor_common_pipeline.c
+++ b/gst/nnstreamer/tensor_common_pipeline.c
@@ -51,7 +51,7 @@ gst_tensor_time_sync_get_mode_string (tensor_time_sync_mode mode)
 
 /**
  * @brief Setup time sync option.
- * @param[in/out] filter "this" pointer. sync_mode & option MUST BE set already.
+ * @param[in/out] filter "this" pointer. Sync mode & option MUST BE set already.
  * @return True if successfully set the option.
  */
 gboolean

diff --git a/gst/nnstreamer/tensor_merge/gsttensormerge.c b/gst/nnstreamer/tensor_merge/gsttensormerge.c
index 1c2d65d..2dbd36e 100644 (file)
--- a/gst/nnstreamer/tensor_merge/gsttensormerge.c
+++ b/gst/nnstreamer/tensor_merge/gsttensormerge.c
@@ -160,11 +160,11 @@ gst_tensor_merge_class_init (GstTensorMergeClass * klass)
           "Option for the tensor Merge mode ?", "", G_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class, PROP_SYNC_MODE,
-      g_param_spec_string ("sync_mode", "Sync_Mode",
+      g_param_spec_string ("sync-mode", "Sync Mode",
           "Time synchronization mode?", "", G_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class, PROP_SYNC_OPTION,
-      g_param_spec_string ("sync_option", "Sync_Option",
+      g_param_spec_string ("sync-option", "Sync Option",
           "Option for the time synchronization mode ?", "", G_PARAM_READWRITE));
 
   gstelement_class->request_new_pad =

diff --git a/gst/nnstreamer/tensor_mux/gsttensormux.c b/gst/nnstreamer/tensor_mux/gsttensormux.c
index 0741551..9cc07f8 100644 (file)
--- a/gst/nnstreamer/tensor_mux/gsttensormux.c
+++ b/gst/nnstreamer/tensor_mux/gsttensormux.c
@@ -161,11 +161,11 @@ gst_tensor_mux_class_init (GstTensorMuxClass * klass)
           TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class, PROP_SYNC_MODE,
-      g_param_spec_string ("sync_mode", "Sync_Mode",
+      g_param_spec_string ("sync-mode", "Sync Mode",
           "Time synchronization mode?", "", G_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class, PROP_SYNC_OPTION,
-      g_param_spec_string ("sync_option", "Sync_Option",
+      g_param_spec_string ("sync-option", "Sync Option",
           "Option for the time synchronization mode ?", "", G_PARAM_READWRITE));
 
   gstelement_class->request_new_pad =

diff --git a/tests/nnstreamer_flatbuf/runTest.sh b/tests/nnstreamer_flatbuf/runTest.sh
index d319920..1bd8762 100755 (executable)
--- a/tests/nnstreamer_flatbuf/runTest.sh
+++ b/tests/nnstreamer_flatbuf/runTest.sh
@@ -74,7 +74,7 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} audiotestsrc num-buffers=1 samplesp
 callCompareTest test.audio16k2c.u16le.origin.log test.audio16k2c.u16le.log 2-6 "Audio16k2c-u16le Golden Test" 0 0
 
 # tensor merge test (The output is always in the format of other/tensor)
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0:0 ! multifilesink location=testsynch08_%1d.log \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0:0 ! multifilesink location=testsynch08_%1d.log \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter !  \
         tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! merge.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! \
@@ -85,9 +85,9 @@ callCompareTest testsynch08_2.golden testsynch08_2.log 3-3 "Tensor merge Compare
 callCompareTest testsynch08_3.golden testsynch08_3.log 3-4 "Tensor merge Compare 3-4" 1 0
 
 # tensor mux test (The output is always in the format of other/tensors)
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=basepad sync_option=1:50000000 ! multifilesink location=testsynch19_%1d.log \
-    tensor_mux name=tensor_mux0  sync_mode=slowest ! tensors_mux.sink_0 \
-    tensor_mux name=tensor_mux1  sync_mode=slowest ! tensors_mux.sink_1 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=basepad sync-option=1:50000000 ! multifilesink location=testsynch19_%1d.log \
+    tensor_mux name=tensor_mux0  sync-mode=slowest ! tensors_mux.sink_0 \
+    tensor_mux name=tensor_mux1  sync-mode=slowest ! tensors_mux.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! \
         tensor_converter ! tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! tensor_mux0.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! \
@@ -103,9 +103,9 @@ callCompareTest testsynch19_3.golden testsynch19_3.log 4-4 "Tensor mux Compare 4
 callCompareTest testsynch19_4.golden testsynch19_4.log 4-5 "Tensor mux Compare 4-5" 1 0
 
 # test other/tensors
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=basepad sync_option=1:50000000 ! tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! multifilesink location=testsynch19_5_%1d.log \
-    tensor_mux name=tensor_mux0  sync_mode=slowest ! tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! tensors_mux.sink_0 \
-    tensor_mux name=tensor_mux1  sync_mode=slowest ! tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! tensors_mux.sink_1 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=basepad sync-option=1:50000000 ! tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! multifilesink location=testsynch19_5_%1d.log \
+    tensor_mux name=tensor_mux0  sync-mode=slowest ! tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! tensors_mux.sink_0 \
+    tensor_mux name=tensor_mux1  sync-mode=slowest ! tensor_decoder mode=flatbuf ! other/flatbuf-tensor ! tensor_converter ! tensors_mux.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! tensor_mux0.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! tensor_mux0.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! tensor_mux1.sink_0 \

diff --git a/tests/nnstreamer_flexbuf/runTest.sh b/tests/nnstreamer_flexbuf/runTest.sh
index 4c0f9dc..6d4ff7d 100755 (executable)
--- a/tests/nnstreamer_flexbuf/runTest.sh
+++ b/tests/nnstreamer_flexbuf/runTest.sh
@@ -74,9 +74,9 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} audiotestsrc num-buffers=1 samplesp
 callCompareTest test.audio16k2c.u16le.origin.log test.audio16k2c.u16le.log 2-6 "Audio16k2c-u16le Golden Test" 0 0
 
 # Test other/tensors
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=basepad sync_option=1:50000000 ! tensor_decoder mode=flexbuf ! other/flexbuf ! tensor_converter ! multifilesink location=testsynch19_%1d.log \
-    tensor_mux name=tensor_mux0  sync_mode=slowest ! tensor_decoder mode=flexbuf ! other/flexbuf ! tensor_converter ! tensors_mux.sink_0 \
-    tensor_mux name=tensor_mux1  sync_mode=slowest ! tensor_decoder mode=flexbuf ! other/flexbuf ! tensor_converter ! tensors_mux.sink_1 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=basepad sync-option=1:50000000 ! tensor_decoder mode=flexbuf ! other/flexbuf ! tensor_converter ! multifilesink location=testsynch19_%1d.log \
+    tensor_mux name=tensor_mux0  sync-mode=slowest ! tensor_decoder mode=flexbuf ! other/flexbuf ! tensor_converter ! tensors_mux.sink_0 \
+    tensor_mux name=tensor_mux1  sync-mode=slowest ! tensor_decoder mode=flexbuf ! other/flexbuf ! tensor_converter ! tensors_mux.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! tensor_mux0.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! tensor_mux0.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! tensor_mux1.sink_0 \

diff --git a/tests/nnstreamer_merge/runTest.sh b/tests/nnstreamer_merge/runTest.sh
index d8a7901..8a655e1 100644 (file)
--- a/tests/nnstreamer_merge/runTest.sh
+++ b/tests/nnstreamer_merge/runTest.sh
@@ -72,28 +72,28 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linea
 
 callCompareTest batch.golden batch.log 10 "Compare 10" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=slowest ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_1" 11 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=slowest ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_1" 11 0 0 $PERFORMANCE
 
 callCompareTest testsynch00_0.golden testsynch00_0.log 11-1 "Compare 11-1" 1 0
 callCompareTest testsynch00_1.golden testsynch00_1.log 11-2 "Compare 11-2" 1 0
 callCompareTest testsynch00_2.golden testsynch00_2.log 11-3 "Compare 11-3" 1 0
 callCompareTest testsynch00_3.golden testsynch00_3.log 11-4 "Compare 11-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=slowest ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1" 12 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=slowest ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1" 12 0 0 $PERFORMANCE
 
 callCompareTest testsynch01_0.golden testsynch01_0.log 12-1 "Compare 12-1" 1 0
 callCompareTest testsynch01_1.golden testsynch01_1.log 12-2 "Compare 12-2" 1 0
 callCompareTest testsynch01_2.golden testsynch01_2.log 12-3 "Compare 12-3" 1 0
 callCompareTest testsynch01_3.golden testsynch01_3.log 12-4 "Compare 12-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=slowest ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 13 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=slowest ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 13 0 0 $PERFORMANCE
 
 callCompareTest testsynch02_0.golden testsynch02_0.log 13-1 "Compare 13-1" 1 0
 callCompareTest testsynch02_1.golden testsynch02_1.log 13-2 "Compare 13-2" 1 0
 callCompareTest testsynch02_2.golden testsynch02_2.log 13-3 "Compare 13-3" 1 0
 callCompareTest testsynch02_3.golden testsynch02_3.log 13-4 "Compare 13-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0:33333333 ! multifilesink location=testsynch03_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_1" 14 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0:33333333 ! multifilesink location=testsynch03_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_1" 14 0 0 $PERFORMANCE
 
 callCompareTest testsynch03_0.golden testsynch03_0.log 14-1 "Compare 14-1" 1 0
 callCompareTest testsynch03_1.golden testsynch03_1.log 14-2 "Compare 14-2" 1 0
@@ -106,7 +106,7 @@ callCompareTest testsynch03_7.golden testsynch03_7.log 14-8 "Compare 14-8" 1 0
 callCompareTest testsynch03_8.golden testsynch03_8.log 14-9 "Compare 14-9" 1 0
 callCompareTest testsynch03_9.golden testsynch03_9.log 14-10 "Compare 14-10" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0:33333333 ! multifilesink location=testsynch04_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1" 15 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0:33333333 ! multifilesink location=testsynch04_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1" 15 0 0 $PERFORMANCE
 
 callCompareTest testsynch04_0.golden testsynch04_0.log 15-1 "Compare 15-1" 1 0
 callCompareTest testsynch04_1.golden testsynch04_1.log 15-2 "Compare 15-2" 1 0
@@ -119,7 +119,7 @@ callCompareTest testsynch04_7.golden testsynch04_7.log 15-8 "Compare 15-8" 1 0
 callCompareTest testsynch04_8.golden testsynch04_8.log 15-9 "Compare 15-9" 1 0
 callCompareTest testsynch04_9.golden testsynch04_9.log 15-10 "Compare 15-10" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0:33333333 ! multifilesink location=testsynch05_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 16 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0:33333333 ! multifilesink location=testsynch05_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 16 0 0 $PERFORMANCE
 
 callCompareTest testsynch05_0.golden testsynch05_0.log 16-1 "Compare 16-1" 1 0
 callCompareTest testsynch05_1.golden testsynch05_1.log 16-2 "Compare 16-2" 1 0
@@ -132,7 +132,7 @@ callCompareTest testsynch05_7.golden testsynch05_7.log 16-8 "Compare 16-8" 1 0
 callCompareTest testsynch05_8.golden testsynch05_8.log 16-9 "Compare 16-9" 1 0
 callCompareTest testsynch05_9.golden testsynch05_9.log 16-10 "Compare 16-10" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0 ! multifilesink location=testsynch06_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1  multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 17 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0 ! multifilesink location=testsynch06_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1  multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 17 0 0 $PERFORMANCE
 callCompareTest testsynch05_0.golden testsynch06_0.log 17-1 "Compare 17-1" 1 0
 callCompareTest testsynch05_1.golden testsynch06_1.log 17-2 "Compare 17-2" 1 0
 callCompareTest testsynch05_2.golden testsynch06_2.log 17-3 "Compare 17-3" 1 0
@@ -144,20 +144,20 @@ callCompareTest testsynch05_7.golden testsynch06_7.log 17-8 "Compare 17-8" 1 0
 callCompareTest testsynch05_8.golden testsynch06_8.log 17-9 "Compare 17-9" 1 0
 callCompareTest testsynch05_9.golden testsynch06_9.log 17-10 "Compare 17-10" 1 0
 
-# Test Case for sync_option=0 without duration. If it does not set, then it use pts(n+1) - pts(n) as base duration. If there are pts(n-1) and pts(n) avaiable within duration condition, it always take pts(n).
+# Test Case for sync-option=0 without duration. If it does not set, then it use pts(n+1) - pts(n) as base duration. If there are pts(n-1) and pts(n) avaiable within duration condition, it always take pts(n).
 # For this test case, outputs are generated every 1000000000 nsec, and they are [0,0],[1000000000,133333332], [2000000000,2333333332], [3000000000,2999999997]. The reason last one is 2999999997 instead of  3333333332 is EOS of basepad.
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0 ! multifilesink location=testsynch07_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_1" 18 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0 ! multifilesink location=testsynch07_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_1" 18 0 0 $PERFORMANCE
 
 callCompareTest testsynch07_0.golden testsynch07_0.log 18-1 "Compare 18-1" 1 0
 callCompareTest testsynch07_1.golden testsynch07_1.log 18-2 "Compare 18-2" 1 0
 callCompareTest testsynch07_2.golden testsynch07_2.log 18-3 "Compare 18-3" 1 0
 callCompareTest testsynch07_3.golden testsynch07_3.log 18-4 "Compare 18-4" 1 0
 
-# Test Case for sync_option=0:0. If the duration set 0, then it means that every tensor which is exceed base time is not going to be merged. Always it merged nearest tensor with base time.
+# Test Case for sync-option=0:0. If the duration set 0, then it means that every tensor which is exceed base time is not going to be merged. Always it merged nearest tensor with base time.
 # For this test case, outputs are generated every 1000000000 nsec, and they are [0,0],[1000000000,999999999], [2000000000,1999999999], [3000000000,2999999997].
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0:0 ! multifilesink location=testsynch08_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_1" 19 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0:0 ! multifilesink location=testsynch08_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_1" 19 0 0 $PERFORMANCE
 
 callCompareTest testsynch08_0.golden testsynch08_0.log 19-1 "Compare 19-1" 1 0
 callCompareTest testsynch08_1.golden testsynch08_1.log 19-2 "Compare 19-2" 1 0

diff --git a/tests/nnstreamer_mux/runTest.sh b/tests/nnstreamer_mux/runTest.sh
index 0bb377d..9139084 100644 (file)
--- a/tests/nnstreamer_mux/runTest.sh
+++ b/tests/nnstreamer_mux/runTest.sh
@@ -59,28 +59,28 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux ! filesink loc
 
 callCompareTest testcase03.golden testcase03.log 7 "Compare 7" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux sync_mode=slowest ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_1" 8 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux sync-mode=slowest ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_1" 8 0 0 $PERFORMANCE
 
 callCompareTest testsynch00_0.golden testsynch00_0.log 8-1 "Compare 8-1" 1 0
 callCompareTest testsynch00_1.golden testsynch00_1.log 8-2 "Compare 8-2" 1 0
 callCompareTest testsynch00_2.golden testsynch00_2.log 8-3 "Compare 8-3" 1 0
 callCompareTest testsynch00_3.golden testsynch00_3.log 8-4 "Compare 8-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux sync_mode=slowest ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1" 9 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux sync-mode=slowest ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1" 9 0 0 $PERFORMANCE
 
 callCompareTest testsynch01_0.golden testsynch01_0.log 9-1 "Compare 9-1" 1 0
 callCompareTest testsynch01_1.golden testsynch01_1.log 9-2 "Compare 9-2" 1 0
 callCompareTest testsynch01_2.golden testsynch01_2.log 9-3 "Compare 9-3" 1 0
 callCompareTest testsynch01_3.golden testsynch01_3.log 9-4 "Compare 9-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux sync_mode=slowest ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_2" 10 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux sync-mode=slowest ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_2" 10 0 0 $PERFORMANCE
 
 callCompareTest testsynch02_0.golden testsynch02_0.log 10-1 "Compare 10-1" 1 0
 callCompareTest testsynch02_1.golden testsynch02_1.log 10-2 "Compare 10-2" 1 0
 callCompareTest testsynch02_2.golden testsynch02_2.log 10-3 "Compare 10-3" 1 0
 callCompareTest testsynch02_3.golden testsynch02_3.log 10-4 "Compare 10-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux silent=true sync_mode=basepad sync_option=0:33333333 ! multifilesink location=testsynch03_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_1" 11 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux silent=true sync-mode=basepad sync-option=0:33333333 ! multifilesink location=testsynch03_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_1" 11 0 0 $PERFORMANCE
 
 callCompareTest testsynch03_0.golden testsynch03_0.log 11-1 "Compare 11-1" 1 0
 callCompareTest testsynch03_1.golden testsynch03_1.log 11-2 "Compare 11-2" 1 0
@@ -93,7 +93,7 @@ callCompareTest testsynch03_7.golden testsynch03_7.log 11-8 "Compare 11-8" 1 0
 callCompareTest testsynch03_8.golden testsynch03_8.log 11-9 "Compare 11-9" 1 0
 callCompareTest testsynch03_9.golden testsynch03_9.log 11-10 "Compare 11-10" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux silent=true sync_mode=basepad sync_option=0:33333333 ! multifilesink location=testsynch04_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1" 12 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux silent=true sync-mode=basepad sync-option=0:33333333 ! multifilesink location=testsynch04_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1" 12 0 0 $PERFORMANCE
 
 callCompareTest testsynch04_0.golden testsynch04_0.log 12-1 "Compare 12-1" 1 0
 callCompareTest testsynch04_1.golden testsynch04_1.log 12-2 "Compare 12-2" 1 0
@@ -106,7 +106,7 @@ callCompareTest testsynch04_7.golden testsynch04_7.log 12-8 "Compare 12-8" 1 0
 callCompareTest testsynch04_8.golden testsynch04_8.log 12-9 "Compare 12-9" 1 0
 callCompareTest testsynch04_9.golden testsynch04_9.log 12-10 "Compare 12-10" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux silent=true sync_mode=basepad sync_option=0:33333333 ! multifilesink location=testsynch05_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_2" 13 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_mux name=mux silent=true sync-mode=basepad sync-option=0:33333333 ! multifilesink location=testsynch05_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_2" 13 0 0 $PERFORMANCE
 
 callCompareTest testsynch05_0.golden testsynch05_0.log 13-1 "Compare 13-1" 1 0
 callCompareTest testsynch05_1.golden testsynch05_1.log 13-2 "Compare 13-2" 1 0
@@ -153,8 +153,8 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux ! files
 
 callCompareTest testcase04_RGB_100x100.golden testcase16_RGB_100x100.log 16 "Compare 16" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=slowest ! multifilesink location=testsynch17_%1d.log \
-    tensor_mux name=tensor_mux  sync_mode=slowest ! tensors_mux.sink_0 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=slowest ! multifilesink location=testsynch17_%1d.log \
+    tensor_mux name=tensor_mux  sync-mode=slowest ! tensors_mux.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! \
         tensor_converter ! tensor_mux.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! \
@@ -167,9 +167,9 @@ callCompareTest testsynch17_1.golden testsynch17_1.log 17-2 "Compare 17-2" 1 0
 callCompareTest testsynch17_2.golden testsynch17_2.log 17-3 "Compare 17-3" 1 0
 callCompareTest testsynch17_3.golden testsynch17_3.log 17-4 "Compare 17-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=slowest ! multifilesink location=testsynch18_%1d.log \
-    tensor_mux name=tensor_mux0  sync_mode=slowest ! tensors_mux.sink_0 \
-    tensor_mux name=tensor_mux1  sync_mode=slowest ! tensors_mux.sink_1 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=slowest ! multifilesink location=testsynch18_%1d.log \
+    tensor_mux name=tensor_mux0  sync-mode=slowest ! tensors_mux.sink_0 \
+    tensor_mux name=tensor_mux1  sync-mode=slowest ! tensors_mux.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! \
         tensor_converter ! tensor_mux0.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! \
@@ -184,9 +184,9 @@ callCompareTest testsynch18_1.golden testsynch18_1.log 18-2 "Compare 18-2" 1 0
 callCompareTest testsynch18_2.golden testsynch18_2.log 18-3 "Compare 18-3" 1 0
 callCompareTest testsynch18_3.golden testsynch18_3.log 18-4 "Compare 18-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=basepad sync_option=1:50000000 ! multifilesink location=testsynch19_%1d.log \
-    tensor_mux name=tensor_mux0  sync_mode=slowest ! tensors_mux.sink_0 \
-    tensor_mux name=tensor_mux1  sync_mode=slowest ! tensors_mux.sink_1 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=basepad sync-option=1:50000000 ! multifilesink location=testsynch19_%1d.log \
+    tensor_mux name=tensor_mux0  sync-mode=slowest ! tensors_mux.sink_0 \
+    tensor_mux name=tensor_mux1  sync-mode=slowest ! tensors_mux.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! \
         tensor_converter ! tensor_mux0.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! \

diff --git a/tests/nnstreamer_protobuf/runTest.sh b/tests/nnstreamer_protobuf/runTest.sh
index 949a70f..598e149 100755 (executable)
--- a/tests/nnstreamer_protobuf/runTest.sh
+++ b/tests/nnstreamer_protobuf/runTest.sh
@@ -74,7 +74,7 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} audiotestsrc num-buffers=1 samplesp
 callCompareTest test.audio16k2c.u16le.origin.log test.audio16k2c.u16le.log 2-6 "Audio16k2c-u16le Golden Test" 0 0
 
 # tensor merge test (The output is always in the format of other/tensor)
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync_mode=basepad sync_option=0:0 ! multifilesink location=testsynch08_%1d.log \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN}  tensor_merge name=merge mode=linear option=2 silent=true sync-mode=basepad sync-option=0:0 ! multifilesink location=testsynch08_%1d.log \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter !  \
         tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! merge.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! \
@@ -85,9 +85,9 @@ callCompareTest testsynch08_2.golden testsynch08_2.log 3-3 "Tensor merge Compare
 callCompareTest testsynch08_3.golden testsynch08_3.log 3-4 "Tensor merge Compare 3-4" 1 0
 
 # tensor mux test (The output is always in the format of other/tensors)
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=basepad sync_option=1:50000000 ! multifilesink location=testsynch19_%1d.log \
-    tensor_mux name=tensor_mux0  sync_mode=slowest ! tensors_mux.sink_0 \
-    tensor_mux name=tensor_mux1  sync_mode=slowest ! tensors_mux.sink_1 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=basepad sync-option=1:50000000 ! multifilesink location=testsynch19_%1d.log \
+    tensor_mux name=tensor_mux0  sync-mode=slowest ! tensors_mux.sink_0 \
+    tensor_mux name=tensor_mux1  sync-mode=slowest ! tensors_mux.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! \
         tensor_converter ! tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! tensor_mux0.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! \
@@ -103,9 +103,9 @@ callCompareTest testsynch19_3.golden testsynch19_3.log 4-4 "Tensor mux Compare 4
 callCompareTest testsynch19_4.golden testsynch19_4.log 4-5 "Tensor mux Compare 4-5" 1 0
 
 # test other/tensors
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync_mode=basepad sync_option=1:50000000 ! tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! multifilesink location=testsynch19_5_%1d.log \
-    tensor_mux name=tensor_mux0  sync_mode=slowest ! tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! tensors_mux.sink_0 \
-    tensor_mux name=tensor_mux1  sync_mode=slowest ! tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! tensors_mux.sink_1 \
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=tensors_mux sync-mode=basepad sync-option=1:50000000 ! tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! multifilesink location=testsynch19_5_%1d.log \
+    tensor_mux name=tensor_mux0  sync-mode=slowest ! tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! tensors_mux.sink_0 \
+    tensor_mux name=tensor_mux1  sync-mode=slowest ! tensor_decoder mode=protobuf ! other/protobuf-tensor ! tensor_converter ! tensors_mux.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! tensor_mux0.sink_0 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! tensor_mux0.sink_1 \
     multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! tensor_mux1.sink_0 \

diff --git a/tests/nnstreamer_repo_lstm/runTest.sh b/tests/nnstreamer_repo_lstm/runTest.sh
index fef438b..8fac041 100755 (executable)
--- a/tests/nnstreamer_repo_lstm/runTest.sh
+++ b/tests/nnstreamer_repo_lstm/runTest.sh
@@ -52,7 +52,7 @@ fi
 python3 generateTestCase.py
 
 gstTest "--gst-plugin-path=../../build \
-tensor_mux name=mux sync_mode=nosync ! \
+tensor_mux name=mux sync-mode=nosync ! \
 tensor_filter framework=custom model=${LSTM_DIR}/libdummyLSTM.${SO_EXT} ! \
 tensor_demux name=demux \
     demux.src_0 ! queue ! tensor_reposink slot-index=0 silent=false \

diff --git a/tests/nnstreamer_repo_rnn/runTest.sh b/tests/nnstreamer_repo_rnn/runTest.sh
index 98b908a..1a5544a 100755 (executable)
--- a/tests/nnstreamer_repo_rnn/runTest.sh
+++ b/tests/nnstreamer_repo_rnn/runTest.sh
@@ -37,7 +37,7 @@ fi
 # Generate video_4x4xBGRx.xraw
 python3 generateTestCase.py
 
-gstTest "--gst-plugin-path=../../build tensor_mux name=mux sync_mode=nosync ! tensor_filter framework=custom model=${RNN_DIR}/libdummyRNN.${SO_EXT} ! tee name=t ! queue ! tensor_reposink slot-index=0 silent=false filesrc location=\"video_4x4xBGRx.xraw\" ! application/octet-stream ! tensor_converter input-dim=4:4:4:1 input-type=uint8 ! mux.sink_0 tensor_reposrc slot-index=0 silent=false caps=\"other/tensor,dimension=(string)4:4:4:1,type=(string)uint8,framerate=(fraction)0/1\" ! mux.sink_1 t. ! queue ! multifilesink location=\"out_%1d.log\"" 1 0 0 $PERFORMANCE
+gstTest "--gst-plugin-path=../../build tensor_mux name=mux sync-mode=nosync ! tensor_filter framework=custom model=${RNN_DIR}/libdummyRNN.${SO_EXT} ! tee name=t ! queue ! tensor_reposink slot-index=0 silent=false filesrc location=\"video_4x4xBGRx.xraw\" ! application/octet-stream ! tensor_converter input-dim=4:4:4:1 input-type=uint8 ! mux.sink_0 tensor_reposrc slot-index=0 silent=false caps=\"other/tensor,dimension=(string)4:4:4:1,type=(string)uint8,framerate=(fraction)0/1\" ! mux.sink_1 t. ! queue ! multifilesink location=\"out_%1d.log\"" 1 0 0 $PERFORMANCE
 
 callCompareTest rnn.golden out_9.log 1-1 "Compare 1-1" 1 0
 

diff --git a/tests/nnstreamer_sink/unittest_sink.cc b/tests/nnstreamer_sink/unittest_sink.cc
index ecdbfb5..80308e7 100644 (file)
--- a/tests/nnstreamer_sink/unittest_sink.cc
+++ b/tests/nnstreamer_sink/unittest_sink.cc
@@ -239,12 +239,12 @@ _free_test_data (TestOption &option)
 
   g_free (g_test_data.caps_name);
 
-  /** remove temp file */      
+  /** remove temp file */
   if (option.tmpfile) {
-    if (g_remove (option.tmpfile) != 0) {      
-      _print_log ("failed to remove temp file %s", option.tmpfile);    
-    }  
-    g_free (option.tmpfile);   
+    if (g_remove (option.tmpfile) != 0) {
+      _print_log ("failed to remove temp file %s", option.tmpfile);
+    }
+    g_free (option.tmpfile);
   }
 }
 
@@ -949,7 +949,7 @@ _setup_pipeline (TestOption &option)
     str_pipeline = g_strdup_printf (
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=10/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_0 "
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=25/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_1 "
-        "tensor_mux sync_mode=slowest name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
+        "tensor_mux sync-mode=slowest name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
         option.num_buffers * 10, custom_dir ? custom_dir : "./nnstreamer_example",
         NNSTREAMER_SO_FILE_EXTENSION, option.num_buffers * 25,
         custom_dir ? custom_dir : "./nnstreamer_example",
@@ -961,7 +961,7 @@ _setup_pipeline (TestOption &option)
     str_pipeline = g_strdup_printf (
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=10/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_0 "
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=25/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_1 "
-        "tensor_mux sync_mode=basepad sync_option=0:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
+        "tensor_mux sync-mode=basepad sync-option=0:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
         option.num_buffers * 10, custom_dir ? custom_dir : "./nnstreamer_example",
         NNSTREAMER_SO_FILE_EXTENSION, option.num_buffers * 25,
         custom_dir ? custom_dir : "./nnstreamer_example",
@@ -973,7 +973,7 @@ _setup_pipeline (TestOption &option)
     str_pipeline = g_strdup_printf (
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=10/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_0 "
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=25/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_1 "
-        "tensor_mux sync_mode=basepad sync_option=1:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
+        "tensor_mux sync-mode=basepad sync-option=1:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
         option.num_buffers * 10, custom_dir ? custom_dir : "./nnstreamer_example",
         NNSTREAMER_SO_FILE_EXTENSION, option.num_buffers * 25,
         custom_dir ? custom_dir : "./nnstreamer_example",
@@ -986,7 +986,7 @@ _setup_pipeline (TestOption &option)
     str_pipeline = g_strdup_printf (
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=10/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_0 "
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=25/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_1 "
-        "tensor_mux sync_mode=basepad sync_option=1:1000000000 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
+        "tensor_mux sync-mode=basepad sync-option=1:1000000000 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
         option.num_buffers * 10, custom_dir ? custom_dir : "./nnstreamer_example",
         NNSTREAMER_SO_FILE_EXTENSION, option.num_buffers * 25,
         custom_dir ? custom_dir : "./nnstreamer_example",
@@ -998,7 +998,7 @@ _setup_pipeline (TestOption &option)
     str_pipeline = g_strdup_printf (
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=10/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_0 "
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=25/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_1 "
-        "tensor_merge mode=linear option=3 sync_mode=slowest name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
+        "tensor_merge mode=linear option=3 sync-mode=slowest name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
         option.num_buffers * 10, custom_dir ? custom_dir : "./nnstreamer_example",
         NNSTREAMER_SO_FILE_EXTENSION, option.num_buffers * 25,
         custom_dir ? custom_dir : "./nnstreamer_example",
@@ -1010,7 +1010,7 @@ _setup_pipeline (TestOption &option)
     str_pipeline = g_strdup_printf (
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=10/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_0 "
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=25/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_1 "
-        "tensor_merge mode=linear option=3 sync_mode=basepad sync_option=0:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
+        "tensor_merge mode=linear option=3 sync-mode=basepad sync-option=0:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
         option.num_buffers * 10, custom_dir ? custom_dir : "./nnstreamer_example",
         NNSTREAMER_SO_FILE_EXTENSION, option.num_buffers * 25,
         custom_dir ? custom_dir : "./nnstreamer_example",
@@ -1022,7 +1022,7 @@ _setup_pipeline (TestOption &option)
     str_pipeline = g_strdup_printf (
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=10/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_0 "
         "videotestsrc pattern=snow num-buffers=%d ! video/x-raw,format=BGRx,height=4,width=4,framerate=25/1 ! tensor_converter ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! mux.sink_1 "
-        "tensor_merge mode=linear option=3 sync_mode=basepad sync_option=1:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
+        "tensor_merge mode=linear option=3 sync-mode=basepad sync-option=1:0 name=mux ! tensor_filter framework=custom model=%s/libnnscustom_framecounter%s ! tee name=t ! queue ! tensor_sink name=test_sink t. ! queue ! filesink location=%s",
         option.num_buffers * 10, custom_dir ? custom_dir : "./nnstreamer_example",
         NNSTREAMER_SO_FILE_EXTENSION, option.num_buffers * 25,
         custom_dir ? custom_dir : "./nnstreamer_example",
@@ -5276,13 +5276,13 @@ TEST (tensorStreamTest, muxProperties1)
   g_object_get (mux, "silent", &res_silent, NULL);
   EXPECT_EQ (res_silent, !silent);
 
-  /* sync_mode */
-  g_object_get (mux, "sync_mode", &str, NULL);
+  /* sync-mode */
+  g_object_get (mux, "sync-mode", &str, NULL);
   EXPECT_STREQ (str, "basepad");
   g_free (str);
 
-  /* sync_mode */
-  g_object_get (mux, "sync_option", &str, NULL);
+  /* sync-option */
+  g_object_get (mux, "sync-option", &str, NULL);
   EXPECT_STREQ (str, "0:0");
   g_free (str);
 
@@ -5362,13 +5362,13 @@ TEST (tensorStreamTest, mergeProperties1)
   EXPECT_STREQ (str, "3");
   g_free (str);
 
-  /* sync_mode */
-  g_object_get (merge, "sync_mode", &str, NULL);
+  /* sync-mode */
+  g_object_get (merge, "sync-mode", &str, NULL);
   EXPECT_STREQ (str, "basepad");
   g_free (str);
 
-  /* sync_mode */
-  g_object_get (merge, "sync_option", &str, NULL);
+  /* sync-option */
+  g_object_get (merge, "sync-option", &str, NULL);
   EXPECT_STREQ (str, "0:0");
   g_free (str);