From ee0a12ee1dde28f61afad8ec03c8a8ca621b66ba Mon Sep 17 00:00:00 2001 From: Sangjung woo Date: Thu, 20 Sep 2018 15:56:37 +0900 Subject: [PATCH] [TensorMux] Update the plugin information and its testcase This patch updates the plugin information such as Name, Description when getting by gst-inspect tool. Moreover, this updates its test case since the name is changed. Signed-off-by: Sangjung woo --- gst/tensor_mux/gsttensormux.c | 16 ++++++++-------- tests/nnstreamer_mux/runTest.sh | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gst/tensor_mux/gsttensormux.c b/gst/tensor_mux/gsttensormux.c index 05fc886..53fb6ee 100644 --- a/gst/tensor_mux/gsttensormux.c +++ b/gst/tensor_mux/gsttensormux.c @@ -38,14 +38,14 @@ * * Example launch line * |[ - * gst-launch -v -m tensormux name=mux ! fakesink + * gst-launch -v -m tensor_mux name=mux ! fakesink * filesrc location=b.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_0 * filesrc location=b.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_1 * filesrc location=b.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_2 * ]| * * |[ - * gst-launch -v -m tensormux name=mux ! filesink location=mux.log + * gst-launch -v -m tensor_mux name=mux ! filesink location=mux.log * multifilesrc location="testsequence_%1d.png" index=0 caps="image/png, framerate=(fraction)30/1" ! pngdec ! tensor_converter ! mux.sink_0 * multifilesrc location="testsequence_%1d.png" index=0 caps="image/png, framerate=(fraction)30/1" ! pngdec ! tensor_converter ! mux.sink_1 * multifilesrc location="testsequence_%1d.png" index=0 caps="image/png, framerate=(fraction)30/1" ! pngdec ! tensor_converter ! mux.sink_2 @@ -145,7 +145,7 @@ gst_tensor_mux_class_init (GstTensorMuxClass * klass) gst_static_pad_template_get (&src_templ)); gst_element_class_set_details_simple (gstelement_class, - "tensormux", + "TensorMux", "Mux multiple tensor stream", "Merge multiple tensor stream to tensors stream", "Jijoong Moon "); @@ -586,7 +586,7 @@ gst_tensor_mux_get_property (GObject * object, guint prop_id, * compile this code. GST_PLUGIN_DEFINE needs PACKAGE to be defined. */ #ifndef PACKAGE -#define PACKAGE "tensormux" +#define PACKAGE "tensor_mux" #endif /** @@ -600,9 +600,9 @@ gst_tensor_mux_plugin_init (GstPlugin * tensormux) /** debug category for fltering log messages * exchange the string 'Template tensor_mux' with your description */ - GST_DEBUG_CATEGORY_INIT (gst_tensor_mux_debug, "tensormux", 0, + GST_DEBUG_CATEGORY_INIT (gst_tensor_mux_debug, "tensor_mux", 0, "Tensor Muxer"); - return gst_element_register (tensormux, "tensormux", + return gst_element_register (tensormux, "tensor_mux", GST_RANK_NONE, GST_TYPE_TENSOR_MUX); } @@ -611,7 +611,7 @@ gst_tensor_mux_plugin_init (GstPlugin * tensormux) */ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - tensormux, - "tensormux", + tensor_mux, + "tensor mux plugin", gst_tensor_mux_plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/"); diff --git a/tests/nnstreamer_mux/runTest.sh b/tests/nnstreamer_mux/runTest.sh index 48a8a73..38a12ae 100755 --- a/tests/nnstreamer_mux/runTest.sh +++ b/tests/nnstreamer_mux/runTest.sh @@ -12,31 +12,31 @@ else fi convertBMP2PNG -gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensormux:5 tensormux name=mux ! filesink location=testcase01_RGB_100x100.log filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_0" 1 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! filesink location=testcase01_RGB_100x100.log filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_0" 1 compareAllSizeLimit testcase01_RGB_100x100.golden testcase01_RGB_100x100.log 1 -gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensormux:5 tensormux name=mux ! filesink location=testcase02_RGB_100x100.log filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_0 filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_1" 2 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! filesink location=testcase02_RGB_100x100.log filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_0 filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_1" 2 compareAllSizeLimit testcase02_RGB_100x100.golden testcase02_RGB_100x100.log 2 -gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensormux:5 tensormux name=mux ! filesink location=testcase03_RGB_100x100.log filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_0 filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_1 filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_2" 3 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! filesink location=testcase03_RGB_100x100.log filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_0 filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_1 filesrc location=testcase02_RGB_100x100.png ! pngdec ! videoscale ! imagefreeze ! videoconvert ! video/x-raw,format=RGB,width=100,height=100,framerate=0/1 ! tensor_converter ! mux.sink_2" 3 compareAllSizeLimit testcase03_RGB_100x100.golden testcase03_RGB_100x100.log 3 -gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensormux:5 tensormux name=mux ! filesink location=testcase01.log multifilesrc location=\"testsequence01_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0" 4 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! filesink location=testcase01.log multifilesrc location=\"testsequence01_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0" 4 compareAllSizeLimit testcase01.golden testcase01.log 4 -gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensormux:5 tensormux name=mux ! filesink location=testcase02.log multifilesrc location=\"testsequence02_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence02_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_1" 5 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! filesink location=testcase02.log multifilesrc location=\"testsequence02_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence02_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_1" 5 compareAllSizeLimit testcase02.golden testcase02.log 5 -gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensormux:5 tensormux name=mux ! filesink location=testcase03.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)30/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_2" 6 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! filesink location=testcase03.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)30/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_2" 6 compareAllSizeLimit testcase03.golden testcase03.log 6 -gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensormux:5 tensormux name=mux ! filesink location=testcase04.log multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_2 multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_3" 7 +gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! filesink location=testcase04.log multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_2 multifilesrc location=\"testsequence04_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_3" 7 compareAllSizeLimit testcase03.golden testcase03.log 7 -- 2.7.4