Change server and visualizer_test_suite to get url as an input

[Issue type] update

Change-Id: I6728021226ff9fd2b74ec7f656ab04c1ea25031e
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/test/testsuites/visualizer/remote_display_server/server.cpp b/test/testsuites/visualizer/remote_display_server/server.cpp
index 0c3ed43..6879038 100644 (file)
--- a/test/testsuites/visualizer/remote_display_server/server.cpp
+++ b/test/testsuites/visualizer/remote_display_server/server.cpp
@@ -44,11 +44,11 @@ public:
 };
 
 
-void runServer() {
+void runServer(const char* url) {
 
-       printf("Runserver function\n");
+       std::cout << "Runserver function with "<< url << std::endl;
 
-       std::string server_address("0.0.0.0:50051");
+       std::string server_address(url);
        ImageServiceImpl service;
 
        grpc::ServerBuilder builder;
@@ -70,10 +70,15 @@ void runServer() {
 }
 
 
-int main() {
-       printf("server.cpp starting.. \n");
+int main(int argc, char *argv[]) {
+       if (argc != 2) {
+               std::cout << "server <ip:port>" << std::endl;
+               return 0;
+       }
+
+       std::cout << "server.cpp starting.." << std::endl;
 
-       runServer();
+       runServer(argv[1]);
 
        return 0;
 }

diff --git a/test/testsuites/visualizer/visualizer_test_suite.cpp b/test/testsuites/visualizer/visualizer_test_suite.cpp
index 2cbd1cf..e6610c2 100755 (executable)
--- a/test/testsuites/visualizer/visualizer_test_suite.cpp
+++ b/test/testsuites/visualizer/visualizer_test_suite.cpp
@@ -25,7 +25,7 @@
 #include "mv_util_visualizer_3d.h"
 #include "bunny.h"
 
-#define MAX_ARGS 2
+#define MAX_ARGS 3
 
 static const char doc[] = "[visualizer]\vmediavision visualizer test\n\
  e.g) mv_visualizer_testsuite [0|1] \n\
@@ -35,18 +35,17 @@ static const char doc[] = "[visualizer]\vmediavision visualizer test\n\
 
 #define IMAGE_WIDTH 1920
 #define IMAGE_HEIGHT 1080
-#define RGB888 4
+#define RGBA888 4
 
 #define DEPTH_WIDTH 320
 #define DEPTH_HEIGHT 240
 
-#define HOST_URL "192.168.0.5:50051"
-
 static const char args_doc[] = "2D|3D SOURCE";
 
 struct arguments
 {
        int type;
+       std::string url;
 };
 
 static bool is_raw_initialized = false;
@@ -71,7 +70,7 @@ void perform_visualize_2d(struct arguments *arguments, unsigned int r, unsigned
 
        mv_source_h source = NULL;
        unsigned char *data_buffer = NULL;
-       unsigned long buffer_size = IMAGE_WIDTH * IMAGE_WIDTH * RGB888;
+       unsigned long buffer_size = IMAGE_WIDTH * IMAGE_WIDTH * RGBA888;
        int err = MEDIA_VISION_ERROR_NONE;
 
        data_buffer = new(std::nothrow)unsigned char[buffer_size];
@@ -178,6 +177,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
                else if (state->argc < MAX_ARGS)
                        argp_failure(state, 1, 0, "too few arguments");
                arguments->type = atoi(arg);
+               arguments->url = state->argv[state->next];
 
                state->next = state->argc;
                if (arguments->type < 0 || arguments->type > 2) {
@@ -218,13 +218,13 @@ int main(int argc, char *argv[])
        } else if (arguments.type == 2) {
                std::cout << "visualize_2d remote display" << std::endl;
                for (i = 0; i < 6; i++)
-                       perform_visualize_2d(&arguments, 0, 0 , 0, HOST_URL); // dummy black screen
+                       perform_visualize_2d(&arguments, 0, 0, 0, arguments.url.c_str()); // dummy black screen
                for (i = 0; i < 6; i++)
-                       perform_visualize_2d(&arguments, 255, 0 , 0, HOST_URL); // red
+                       perform_visualize_2d(&arguments, 255, 0, 0, arguments.url.c_str()); // red
                for (i = 0; i < 6; i++)
-                       perform_visualize_2d(&arguments, 0, 255, 0, HOST_URL); // green
+                       perform_visualize_2d(&arguments, 0, 255, 0, arguments.url.c_str()); // green
                for (i = 0; i < 6; i++)
-                       perform_visualize_2d(&arguments, 0, 0, 255, HOST_URL); // blue
+                       perform_visualize_2d(&arguments, 0, 0, 255, arguments.url.c_str()); // blue
        }
        std::chrono::milliseconds ms = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - StartTime);
        std::cout << "total : " << ms.count() << "ms" << std::endl;