webrtc_test: Remove redundant codes in switch-case

Some codes are moved to the top or the bottom of the function
to reduce lines.

[Version] 0.3.213
[Issue Type] Refactoring

Change-Id: I22889884caf3f562703b557824f5b0dddb320cff
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index fc49e7ce11f34e9aeaea51735db640dc6cfd78d3..f4ec95d9886e1bec90e4a5f6d95e81402cb16786 100644 (file)
--- a/packaging/capi-media-webrtc.spec
+++ b/packaging/capi-media-webrtc.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-webrtc
 Summary:    A WebRTC library in Tizen Native API
-Version:    0.3.212
+Version:    0.3.213
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/test/webrtc_test.c b/test/webrtc_test.c
index 87db0cd1cfd63a9e73dcba87c8131c931ec9e298..c9c8a7918fce6143ca234eeb0ca450bd14436c71 100644 (file)
--- a/test/webrtc_test.c
+++ b/test/webrtc_test.c
@@ -3020,80 +3020,55 @@ static void test_webrtc_common(char *cmd)
        switch (g_ad.menu_status) {
        case CURRENT_STATUS_CREATE:
                _webrtc_create(0);
-               reset_menu_state();
                break;
        case CURRENT_STATUS_START:
                _webrtc_start(0);
-               reset_menu_state();
                break;
        case CURRENT_STATUS_STOP:
                _webrtc_stop(0);
-               reset_menu_state();
                break;
        case CURRENT_STATUS_DESTROY:
                _webrtc_destroy(0);
-               reset_menu_state();
                break;
        case CURRENT_STATUS_GET_STATE:
                _webrtc_get_state(0);
-               reset_menu_state();
                break;
-       case CURRENT_STATUS_SET_STUN_SERVER: {
+       case CURRENT_STATUS_SET_STUN_SERVER:
                _webrtc_set_stun_server(0, cmd);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_GET_STUN_SERVER: {
+       case CURRENT_STATUS_GET_STUN_SERVER:
                _webrtc_get_stun_server(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_ADD_TURN_SERVER: {
+       case CURRENT_STATUS_ADD_TURN_SERVER:
                _webrtc_add_turn_server(0, cmd);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_GET_TURN_SERVERS: {
+       case CURRENT_STATUS_GET_TURN_SERVERS:
                _webrtc_get_turn_servers(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_SET_BUNDLE_POLICY: {
+       case CURRENT_STATUS_SET_BUNDLE_POLICY:
                value = atoi(cmd);
                _webrtc_set_bundle_policy(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_GET_BUNDLE_POLICY: {
+       case CURRENT_STATUS_GET_BUNDLE_POLICY:
                value = atoi(cmd);
                _webrtc_get_bundle_policy(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_SET_ICE_TRANSPORT_POLICY: {
+       case CURRENT_STATUS_SET_ICE_TRANSPORT_POLICY:
                value = atoi(cmd);
                _webrtc_set_ice_transport_policy(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_GET_ICE_TRANSPORT_POLICY: {
+       case CURRENT_STATUS_GET_ICE_TRANSPORT_POLICY:
                _webrtc_get_ice_transport_policy(0);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_CREATE_OFFER:
-       case CURRENT_STATUS_CREATE_OFFER_ASYNC: {
+       case CURRENT_STATUS_CREATE_OFFER_ASYNC:
                _webrtc_create_offer(&g_ad.conns[0], g_ad.menu_status == CURRENT_STATUS_CREATE_OFFER ? false : true);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_CREATE_ANSWER:
-       case CURRENT_STATUS_CREATE_ANSWER_ASYNC: {
+       case CURRENT_STATUS_CREATE_ANSWER_ASYNC:
                _webrtc_create_answer(&g_ad.conns[0], g_ad.menu_status == CURRENT_STATUS_CREATE_ANSWER ? false: true);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_SET_LOCAL_DESCRIPTION: {
+       case CURRENT_STATUS_SET_LOCAL_DESCRIPTION:
                value = atoi(cmd);
                if (value == 1)
                        _webrtc_set_local_description(&g_ad.conns[0], true);
@@ -3102,34 +3077,22 @@ static void test_webrtc_common(char *cmd)
                else
                        g_print("invalid value[%d]\n", value);
 
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_SET_REMOTE_DESCRIPTION: {
+       case CURRENT_STATUS_SET_REMOTE_DESCRIPTION:
                _webrtc_set_remote_description(&g_ad.conns[0]);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_ADD_ICE_CANDIDATE: {
+       case CURRENT_STATUS_ADD_ICE_CANDIDATE:
                _webrtc_add_ice_candidate(&g_ad.conns[0], NULL);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_SET_ALL_CALLBACKS: {
+       case CURRENT_STATUS_SET_ALL_CALLBACKS:
                _webrtc_set_all_cbs(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_UNSET_ALL_CALLBACKS: {
+       case CURRENT_STATUS_UNSET_ALL_CALLBACKS:
                _webrtc_unset_all_cbs(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_GET_ALL_NEGOTIATION_STATES: {
+       case CURRENT_STATUS_GET_ALL_NEGOTIATION_STATES:
                _webrtc_get_all_negotiation_states(0);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_SET_RTP_PACKET_DROP_PROBABILITY: {
                static bool sender;
                switch (g_ad.input_count) {
@@ -3137,84 +3100,73 @@ static void test_webrtc_common(char *cmd)
                        value = atoi(cmd);
                        if (value != 1 && value != 2) {
                                g_print("invalid value[%d]\n", value);
-                               reset_menu_state();
                                break;
                        }
                        sender = (value == 1);
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1: {
                        float fvalue = strtof(cmd, NULL);
                        _webrtc_set_rtp_packet_drop_probability(sender, fvalue);
                        sender = false;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                }
                break;
        }
-       case CURRENT_STATUS_GET_RTP_PACKET_DROP_PROBABILITY: {
+       case CURRENT_STATUS_GET_RTP_PACKET_DROP_PROBABILITY:
                value = atoi(cmd);
                if (value != 1 && value != 2) {
                        g_print("invalid value[%d]\n", value);
-                       reset_menu_state();
                        break;
                }
                _webrtc_get_rtp_packet_drop_probability((value == 1));
-               reset_menu_state();
                break;
        }
-       }
+
+       reset_menu_state();
 }
 
 static void test_webrtc_media_source(char *cmd)
 {
-       int value;
+       int value = atoi(cmd);
 
        switch (g_ad.menu_status) {
-       case CURRENT_STATUS_ADD_MEDIA_SOURCE: {
-               value = atoi(cmd);
-
+       case CURRENT_STATUS_ADD_MEDIA_SOURCE:
                switch (g_ad.input_count) {
                case 0:
                        if (value == 3) { /* mic source */
                                g_ad.input_count++;
+                               return;
                        } else {
                                _webrtc_add_media_source(0, value - 1, NULL);
-                               reset_menu_state();
                        }
                        break;
                case 1:
                        _webrtc_add_mic_source(0, !(value == 0), NULL);
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
-       }
-       case CURRENT_STATUS_REMOVE_MEDIA_SOURCE: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_REMOVE_MEDIA_SOURCE:
                _webrtc_remove_media_source(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_MEDIA_SOURCE_SET_PAUSE:
        case CURRENT_STATUS_MEDIA_SOURCE_SET_MUTE:
        case CURRENT_STATUS_MEDIA_SOURCE_SET_ENCODER_BITRATE: {
                static unsigned int id;
                static unsigned int media_type;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 2:
                        if (g_ad.menu_status == CURRENT_STATUS_MEDIA_SOURCE_SET_PAUSE)
                                _webrtc_media_source_set_pause(0, id, media_type, value);
@@ -3224,7 +3176,6 @@ static void test_webrtc_media_source(char *cmd)
                                _webrtc_media_source_set_encoder_bitrate(0, id, media_type, value);
                        id = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3233,13 +3184,12 @@ static void test_webrtc_media_source(char *cmd)
        case CURRENT_STATUS_MEDIA_SOURCE_GET_MUTE:
        case CURRENT_STATUS_MEDIA_SOURCE_GET_ENCODER_BITRATE: {
                static unsigned int id;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        if (g_ad.menu_status == CURRENT_STATUS_MEDIA_SOURCE_GET_PAUSE)
                                _webrtc_media_source_get_pause(0, id, value - 1);
@@ -3249,7 +3199,6 @@ static void test_webrtc_media_source(char *cmd)
                                _webrtc_media_source_get_encoder_bitrate(0, id, value - 1);
                        id = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3258,152 +3207,123 @@ static void test_webrtc_media_source(char *cmd)
                static unsigned int id;
                static int width;
                static int height;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        width = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 2:
                        height =  value;
                        _webrtc_media_source_set_video_resolution(0, id, width, height);
                        id = width = height = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_MEDIA_SOURCE_GET_VIDEO_RESOLUTION: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_MEDIA_SOURCE_GET_VIDEO_RESOLUTION:
                _webrtc_media_source_get_video_resolution(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_MEDIA_SOURCE_SET_VIDEO_FRAMERATE: {
                static unsigned int id;
                static int framerate;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        framerate = value;
                        _webrtc_media_source_set_video_framerate(0, id, framerate);
                        id = framerate = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_MEDIA_SOURCE_GET_VIDEO_FRAMERATE: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_MEDIA_SOURCE_GET_VIDEO_FRAMERATE:
                _webrtc_media_source_get_video_framerate(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_CAMERA_SOURCE_SET_DEVICE_ID: {
                static unsigned int source_id;
                static unsigned int device_id;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        source_id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        device_id = value;
                        _webrtc_camera_source_set_device_id(0, source_id, device_id);
                        source_id = device_id = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_CAMERA_SOURCE_GET_DEVICE_ID: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_CAMERA_SOURCE_GET_DEVICE_ID:
                _webrtc_camera_source_get_device_id(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_FILE_SOURCE_SET_PATH: {
                static unsigned int id;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        _set_media_path(0, id, cmd);
                        id = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
        case CURRENT_STATUS_FILE_SOURCE_SET_LOOPING: {
                static unsigned int id;
-               value = atoi(cmd);
+
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        _webrtc_file_source_set_looping(0, id, value);
                        id = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_FILE_SOURCE_GET_LOOPING: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_FILE_SOURCE_GET_LOOPING:
                _webrtc_file_source_get_looping(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_MEDIA_PACKET_SOURCE_SET_BUFFER_STATE_CHANGED_CB: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_MEDIA_PACKET_SOURCE_SET_BUFFER_STATE_CHANGED_CB:
                _webrtc_media_packet_source_set_buffer_state_changed_cb(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_MEDIA_PACKET_SOURCE_UNSET_BUFFER_STATE_CHANGED_CB: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_MEDIA_PACKET_SOURCE_UNSET_BUFFER_STATE_CHANGED_CB:
                _webrtc_media_packet_source_unset_buffer_state_changed_cb(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_MEDIA_PACKET_SOURCE_SET_FORMAT: {
                static unsigned int id;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        _webrtc_media_packet_source_set_format(0, id, value);
                        id = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3412,23 +3332,21 @@ static void test_webrtc_media_source(char *cmd)
                static unsigned int id;
                static unsigned int media_type;
                unsigned int direction;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 2:
                        direction =  value - 1;
                        _webrtc_media_source_set_transceiver_direction(0, id, media_type, direction);
                        id = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3436,19 +3354,17 @@ static void test_webrtc_media_source(char *cmd)
        case CURRENT_STATUS_MEDIA_SOURCE_GET_TRANSCEIVER_DIRECTION: {
                static unsigned int id;
                static unsigned int media_type;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        _webrtc_media_source_get_transceiver_direction(0, id, media_type);
                        id = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3456,19 +3372,17 @@ static void test_webrtc_media_source(char *cmd)
        case CURRENT_STATUS_MEDIA_SOURCE_FOREACH_SUPPORTED_TRANSCEIVER_CODEC: {
                static unsigned int source_type;
                static unsigned int media_type;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        source_type = value - 1;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        _webrtc_media_source_foreach_supported_transceiver_codec(0, source_type, media_type);
                        source_type = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3476,22 +3390,20 @@ static void test_webrtc_media_source(char *cmd)
        case CURRENT_STATUS_MEDIA_SOURCE_SET_TRANSCEIVER_CODEC: {
                static unsigned int id;
                static unsigned int media_type;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 2:
                        _webrtc_media_source_set_transceiver_codec(0, id, media_type, value);
                        id = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3499,98 +3411,83 @@ static void test_webrtc_media_source(char *cmd)
        case CURRENT_STATUS_MEDIA_SOURCE_GET_TRANSCEIVER_CODEC: {
                static unsigned int id;
                static unsigned int media_type;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        _webrtc_media_source_get_transceiver_codec(0, id, media_type);
                        id = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_START_PUSHING_PACKET_TO_MEDIA_PACKET_SOURCE: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_START_PUSHING_PACKET_TO_MEDIA_PACKET_SOURCE:
                _start_pushing_packet(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_STOP_PUSHING_PACKET_TO_MEDIA_PACKET_SOURCE: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_STOP_PUSHING_PACKET_TO_MEDIA_PACKET_SOURCE:
                _stop_pushing_packet(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_SCREEN_SOURCE_SET_CROP: {
                static unsigned int id;
                static int x, y, w, h;
                static int is_vertical;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        x = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 2:
                        y = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 3:
                        w = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 4:
                        h = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 5:
                        is_vertical = value;
                        int width, height;
                        _webrtc_screen_source_set_crop(0, id, x, y, w, h, is_vertical, &width, &height);
                        x = y = w = h = is_vertical = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_SCREEN_SOURCE_UNSET_CROP: {
-               value = atoi(cmd);
+       case CURRENT_STATUS_SCREEN_SOURCE_UNSET_CROP:
                _webrtc_screen_source_unset_crop(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_MEDIA_SOURCE_SET_PAYLOAD_TYPE: {
                static unsigned int id;
                static unsigned int media_type;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 2:
                        _webrtc_media_source_set_payload_type(0, id, media_type, value);
                        id = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
@@ -3598,24 +3495,24 @@ static void test_webrtc_media_source(char *cmd)
        case CURRENT_STATUS_MEDIA_SOURCE_GET_PAYLOAD_TYPE: {
                static unsigned int id;
                static unsigned int media_type;
-               value = atoi(cmd);
 
                switch (g_ad.input_count) {
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        media_type = value - 1;
                        _webrtc_media_source_get_payload_type(0, id, media_type);
                        id = media_type = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
        }
+
+       reset_menu_state();
 }
 
 static void test_webrtc_media_render(char *cmd)
@@ -3623,12 +3520,10 @@ static void test_webrtc_media_render(char *cmd)
        int value;
 
        switch (g_ad.menu_status) {
-       case CURRENT_STATUS_SET_DISPLAY_TYPE: {
+       case CURRENT_STATUS_SET_DISPLAY_TYPE:
                value = atoi(cmd);
                _webrtc_set_display_type(0, value - 1);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_SET_DISPLAY_MODE: {
                static unsigned int id;
                value = atoi(cmd);
@@ -3637,22 +3532,19 @@ static void test_webrtc_media_render(char *cmd)
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        _webrtc_set_display_mode(0, id, value - 1);
                        id = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_GET_DISPLAY_MODE: {
+       case CURRENT_STATUS_GET_DISPLAY_MODE:
                value = atoi(cmd);
                _webrtc_get_display_mode(0, value);
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_SET_DISPLAY_VISIBLE: {
                static unsigned int id;
                value = atoi(cmd);
@@ -3661,134 +3553,98 @@ static void test_webrtc_media_render(char *cmd)
                case 0:
                        id = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        _webrtc_set_display_visible(0, id, value);
                        id = 0;
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_GET_DISPLAY_VISIBLE: {
+       case CURRENT_STATUS_GET_DISPLAY_VISIBLE:
                value = atoi(cmd);
                _webrtc_get_display_visible(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_SET_ENCODED_AUDIO_FRAME_CB: {
+       case CURRENT_STATUS_SET_ENCODED_AUDIO_FRAME_CB:
                _webrtc_set_encoded_audio_frame_cb(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_UNSET_ENCODED_AUDIO_FRAME_CB: {
+       case CURRENT_STATUS_UNSET_ENCODED_AUDIO_FRAME_CB:
                _webrtc_unset_encoded_audio_frame_cb(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_SET_ENCODED_VIDEO_FRAME_CB: {
+       case CURRENT_STATUS_SET_ENCODED_VIDEO_FRAME_CB:
                _webrtc_set_encoded_video_frame_cb(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_UNSET_ENCODED_VIDEO_FRAME_CB: {
+       case CURRENT_STATUS_UNSET_ENCODED_VIDEO_FRAME_CB:
                _webrtc_unset_encoded_video_frame_cb(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_MEDIA_SOURCE_SET_AUDIO_LOOPBACK: {
+       case CURRENT_STATUS_MEDIA_SOURCE_SET_AUDIO_LOOPBACK:
                value = atoi(cmd);
                _webrtc_media_source_set_audio_loopback(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_MEDIA_SOURCE_UNSET_AUDIO_LOOPBACK: {
+       case CURRENT_STATUS_MEDIA_SOURCE_UNSET_AUDIO_LOOPBACK:
                value = atoi(cmd);
                _webrtc_media_source_unset_audio_loopback(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_MEDIA_SOURCE_SET_VIDEO_LOOPBACK: {
+       case CURRENT_STATUS_MEDIA_SOURCE_SET_VIDEO_LOOPBACK:
                value = atoi(cmd);
                _webrtc_media_source_set_video_loopback(0, value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_MEDIA_SOURCE_UNSET_VIDEO_LOOPBACK: {
+       case CURRENT_STATUS_MEDIA_SOURCE_UNSET_VIDEO_LOOPBACK:
                value = atoi(cmd);
                _webrtc_media_source_unset_video_loopback(0, value);
-               reset_menu_state();
                break;
        }
-       }
+
+       reset_menu_state();
 }
 
 static void test_webrtc_data_channel(char *cmd)
 {
        switch (g_ad.menu_status) {
-       case CURRENT_STATUS_DATA_CHANNEL_CREATE: {
+       case CURRENT_STATUS_DATA_CHANNEL_CREATE:
                _webrtc_create_data_channel(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_DESTROY: {
+       case CURRENT_STATUS_DATA_CHANNEL_DESTROY:
                _webrtc_destroy_data_channel(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_GET_LABEL: {
+       case CURRENT_STATUS_DATA_CHANNEL_GET_LABEL:
                _webrtc_data_channel_get_label(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_SEND_STRING: {
+       case CURRENT_STATUS_DATA_CHANNEL_SEND_STRING:
                _webrtc_data_channel_send_string(cmd, false);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_SEND_STRING_AS_BYTES: {
+       case CURRENT_STATUS_DATA_CHANNEL_SEND_STRING_AS_BYTES:
                _webrtc_data_channel_send_string(cmd, true);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_SEND_FILE: {
+       case CURRENT_STATUS_DATA_CHANNEL_SEND_FILE:
                _webrtc_data_channel_send_file(0, cmd);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_SET_BUFFERED_AMOUNT_LOW_CB: {
+       case CURRENT_STATUS_DATA_CHANNEL_SET_BUFFERED_AMOUNT_LOW_CB:
                _webrtc_data_channel_set_buffered_amount_low_cb(0, (unsigned int)atoi(cmd));
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_UNSET_BUFFERED_AMOUNT_LOW_CB: {
+       case CURRENT_STATUS_DATA_CHANNEL_UNSET_BUFFERED_AMOUNT_LOW_CB:
                _webrtc_data_channel_unset_buffered_amount_low_cb(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_GET_BUFFERED_AMOUNT_LOW_THRESHOLD: {
+       case CURRENT_STATUS_DATA_CHANNEL_GET_BUFFERED_AMOUNT_LOW_THRESHOLD:
                _webrtc_data_channel_get_buffered_amount_low_threshold(0);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_DATA_CHANNEL_GET_BUFFERED_AMOUNT: {
+       case CURRENT_STATUS_DATA_CHANNEL_GET_BUFFERED_AMOUNT:
                _webrtc_data_channel_get_buffered_amount(0);
-               reset_menu_state();
                break;
        }
-       }
+
+       reset_menu_state();
 }
 
 static void test_webrtc_stats(char *cmd)
 {
        switch (g_ad.menu_status) {
-       case CURRENT_STATUS_FOREACH_STATS: {
+       case CURRENT_STATUS_FOREACH_STATS:
                _webrtc_foreach_stats(0, atoi(cmd));
                reset_menu_state();
                break;
        }
-       }
 }
 
 static void app_setting_and_signaling(char *cmd)
@@ -3796,43 +3652,34 @@ static void app_setting_and_signaling(char *cmd)
        int value;
 
        switch (g_ad.menu_status) {
-       case CURRENT_STATUS_SETTING_SIGNALING_SERVER: {
+       case CURRENT_STATUS_SETTING_SIGNALING_SERVER:
                _setting_uri(g_ad.signaling_server.public.url, cmd);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_CONNECT_SIGNALING_SERVER: {
+       case CURRENT_STATUS_CONNECT_SIGNALING_SERVER:
                _connect_signaling_server();
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_REQUEST_SESSION: {
+       case CURRENT_STATUS_REQUEST_SESSION:
                value = atoi(cmd);
                _request_session(value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_REQUEST_JOIN_ROOM: {
+       case CURRENT_STATUS_REQUEST_JOIN_ROOM:
                switch (g_ad.input_count) {
                case 0:
                        value = atoi(cmd);
                        if (value <= 0 || value > 3) {
                                g_printerr("invalid value[%d]\n", value);
-                               reset_menu_state();
                                break;
                        }
                        g_ad.conns[0].room_source_type = value;
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        _websocket_request_join_room(cmd);
                        g_ad.input_count = 0;
-                       reset_menu_state();
                        break;
                }
                break;
-       }
-       case CURRENT_STATUS_SEND_LOCAL_DESCRIPTION: {
+       case CURRENT_STATUS_SEND_LOCAL_DESCRIPTION:
                value = atoi(cmd);
                if (value == 1)
                        _send_local_description(true);
@@ -3841,36 +3688,25 @@ static void app_setting_and_signaling(char *cmd)
                else
                        g_print("invalid value[%d]\n", value);
 
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_CREATE: {
+       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_CREATE:
                value = atoi(cmd);
                _webrtc_signaling_server_create(value);
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_DESTROY: {
+       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_DESTROY:
                _webrtc_signaling_server_destroy();
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_START: {
+       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_START:
                _webrtc_signaling_server_start();
-               reset_menu_state();
                break;
-       }
-       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_STOP: {
+       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_STOP:
                _webrtc_signaling_server_stop();
-               reset_menu_state();
                break;
-       }
        case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_CONNECT: {
                static char *ip = NULL;
 
                if (strlen(g_ad.signaling_server.public.url) > 0) {
                        g_printerr("server[%s] is already set by 'ss'\n", g_ad.signaling_server.public.url);
-                       reset_menu_state();
                        break;
                }
 
@@ -3878,7 +3714,7 @@ static void app_setting_and_signaling(char *cmd)
                case 0:
                        ip = strdup(cmd);
                        g_ad.input_count++;
-                       break;
+                       return;
                case 1:
                        value = atoi(cmd);
                        _webrtc_signaling_connect(ip, value);
@@ -3887,17 +3723,16 @@ static void app_setting_and_signaling(char *cmd)
                                free(ip);
                                ip = NULL;
                        }
-                       reset_menu_state();
                        break;
                }
                break;
        }
-       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_DISCONNECT: {
+       case CURRENT_STATUS_PRIVATE_SIGNALING_SERVER_DISCONNECT:
                _webrtc_signaling_disconnect();
-               reset_menu_state();
                break;
        }
-       }
+
+       reset_menu_state();
 }
 
 static void interpret(char *cmd)