From 599b3b87e6a2a7778b0c0d18a35d48d4f98c5718 Mon Sep 17 00:00:00 2001 From: Sangjung woo Date: Thu, 20 Sep 2018 17:01:51 +0900 Subject: [PATCH] [Example] Use tensor_decoder instead of tensordec This patch uses tensor_decoder instead of tensordec since its name is changed. Signed-off-by: Sangjung woo --- nnstreamer_example/example_cam/nnstreamer_example_cam.c | 2 +- nnstreamer_example/example_sink/nnstreamer_sink_example_play.c | 4 ++-- tests/nnstreamer_sink/unittest_sink.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nnstreamer_example/example_cam/nnstreamer_example_cam.c b/nnstreamer_example/example_cam/nnstreamer_example_cam.c index d7010f5..eb5bbb0 100644 --- a/nnstreamer_example/example_cam/nnstreamer_example_cam.c +++ b/nnstreamer_example/example_cam/nnstreamer_example_cam.c @@ -198,7 +198,7 @@ main (int argc, char **argv) "sink_1::xpos=0 sink_1::ypos=0 sink_1::zorder=1 sink_1::alpha=0.7 ! " "videoconvert ! ximagesink name=img_mixed " "t_raw. ! queue ! mix.sink_0 " - "t_raw. ! queue ! tensor_converter ! tensordec ! videoscale ! video/x-raw,width=%d,height=%d ! mix.sink_1 " + "t_raw. ! queue ! tensor_converter ! tensor_decoder ! videoscale ! video/x-raw,width=%d,height=%d ! mix.sink_1 " "t_raw. ! queue ! videoconvert ! ximagesink name=img_origin", width, height, width / 2, height / 2); g_app.pipeline = gst_parse_launch (str_pipeline, NULL); diff --git a/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c b/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c index 96051e2..b7f0288 100644 --- a/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c +++ b/nnstreamer_example/example_sink/nnstreamer_sink_example_play.c @@ -10,7 +10,7 @@ * * [1st pipeline : videotestsrc-tensor_converter-tensor_sink] * push buffer to appsrc - * [2nd pipeline : appsrc-tensordec-videoconvert-ximagesink] + * [2nd pipeline : appsrc-tensor_decoder-videoconvert-ximagesink] * * Run example : * Before running this example, GST_PLUGIN_PATH should be updated for nnstreamer plug-in. @@ -297,7 +297,7 @@ main (int argc, char **argv) /** init player pipeline */ str_pipeline = g_strdup_printf - ("appsrc name=player_src ! tensordec ! videoconvert ! ximagesink"); + ("appsrc name=player_src ! tensor_decoder ! videoconvert ! ximagesink"); g_app.player_pipeline = gst_parse_launch (str_pipeline, NULL); g_free (str_pipeline); _check_cond_err (g_app.player_pipeline != NULL); diff --git a/tests/nnstreamer_sink/unittest_sink.cpp b/tests/nnstreamer_sink/unittest_sink.cpp index 0d3a8d7..471cfbd 100644 --- a/tests/nnstreamer_sink/unittest_sink.cpp +++ b/tests/nnstreamer_sink/unittest_sink.cpp @@ -66,7 +66,7 @@ typedef enum TEST_TYPE_AUDIO_U16_1000F, /**< pipeline for audio (U16) 1000 frames */ TEST_TYPE_TEXT, /**< pipeline for text */ TEST_TYPE_TEXT_3F, /**< pipeline for text 3 frames */ - TEST_TYPE_TENSORS, /**< pipeline for tensors with tensormux */ + TEST_TYPE_TENSORS, /**< pipeline for tensors with tensor_mux */ TEST_TYPE_NEGO_FAILED, /**< pipeline to test caps negotiation */ TEST_TYPE_VIDEO_RGB_AGGR, /**< pipeline to test tensor-aggregator */ TEST_TYPE_AUDIO_S16_AGGR, /**< pipeline to test tensor-aggregator */ @@ -437,10 +437,10 @@ _setup_pipeline (TestOption & option) break; break; case TEST_TYPE_TENSORS: - /** other/tensors with tensormux */ + /** other/tensors with tensor_mux */ str_pipeline = g_strdup_printf - ("tensormux name=mux ! tensor_sink name=test_sink " + ("tensor_mux name=mux ! tensor_sink name=test_sink " "videotestsrc num-buffers=%d ! video/x-raw,width=160,height=120,format=RGB,framerate=(fraction)30/1 ! tensor_converter ! mux.sink_0 " "videotestsrc num-buffers=%d ! video/x-raw,width=160,height=120,format=RGB,framerate=(fraction)30/1 ! tensor_converter ! mux.sink_1 ", option.num_buffers, option.num_buffers); -- 2.7.4