[0.3.81] modify the test suite about codec type

Change-Id: I17abf03fd16414e99303ca865da3f81abd5883bb

diff --git a/test/player_test.c b/test/player_test.c
index c446146..ce03ee7 100644 (file)
--- a/test/player_test.c
+++ b/test/player_test.c
@@ -172,8 +172,8 @@ enum {
        CURRENT_STATUS_VIDEO360_SET_FOV,
        CURRENT_STATUS_VIDEO360_SET_FOV1,
        CURRENT_STATUS_VIDEO360_SET_ZOOM,
-       CURRENT_STATUS_VIDEO_CODEC_TYPE,
        CURRENT_STATUS_AUDIO_CODEC_TYPE,
+       CURRENT_STATUS_VIDEO_CODEC_TYPE,
 };
 
 typedef struct {
@@ -2238,7 +2238,7 @@ void _interpret_main_menu(char *cmd)
                } else if (strncmp(cmd, "bf", 2) == 0) {
                        g_menu_state = CURRENT_STATUS_SET_PRE_BUFFERING_SIZE;
                } else if (strncmp(cmd, "C1", 2) == 0) {
-                       g_menu_state = CURRENT_STATUS_VIDEO_CODEC_TYPE;
+                       g_menu_state = CURRENT_STATUS_AUDIO_CODEC_TYPE;
                } else if (strncmp(cmd, "C2", 2) == 0) {
                        get_codec_type();
                } else {
@@ -2424,10 +2424,10 @@ static void displaymenu()
                g_print("*** input vertical field of view angle (1~180 deg.)\n");
        } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_ZOOM) {
                g_print("*** input zoom factor.(1.0~10.0, where 1.0 - no zoom, actual image) \n");
-       } else if (g_menu_state == CURRENT_STATUS_VIDEO_CODEC_TYPE) {
-               g_print("*** set video codec type (1: HW, 2: SW) \n");
        } else if (g_menu_state == CURRENT_STATUS_AUDIO_CODEC_TYPE) {
                g_print("*** set audio codec type (1: HW, 2: SW) \n");
+       } else if (g_menu_state == CURRENT_STATUS_VIDEO_CODEC_TYPE) {
+               g_print("*** set video codec type (1: HW, 2: SW) \n");
        } else {
                g_print("*** unknown status.\n");
                quit_program();
@@ -2728,18 +2728,17 @@ static void interpret(char *cmd)
                        reset_menu_state();
                }
                break;
-       case CURRENT_STATUS_VIDEO_CODEC_TYPE:
+       case CURRENT_STATUS_AUDIO_CODEC_TYPE:
                {
                        int value = atoi(cmd);
-                       codec_type.v_codec_type = value;
-                       g_menu_state = CURRENT_STATUS_AUDIO_CODEC_TYPE;
-
+                       codec_type.a_codec_type = value;
+                       g_menu_state = CURRENT_STATUS_VIDEO_CODEC_TYPE;
                }
                break;
-       case CURRENT_STATUS_AUDIO_CODEC_TYPE:
+       case CURRENT_STATUS_VIDEO_CODEC_TYPE:
                {
                        int value = atoi(cmd);
-                       codec_type.a_codec_type = value;
+                       codec_type.v_codec_type = value;
                        set_codec_type();
                        reset_menu_state();
                }