From 4c2dc95348e05b87b62aa2d9afe5eab44ae86ce8 Mon Sep 17 00:00:00 2001 From: Hyunil Date: Thu, 16 Jun 2016 13:22:36 +0900 Subject: [PATCH] 1. Remove text about X display 2. Remove player_test ROI mode Change-Id: Ibd329ab74f6052f1943a50fbf65f4715c7c120c2 Signed-off-by: Hyunil --- test/player_test.c | 175 ++--------------------------------------------------- 1 file changed, 5 insertions(+), 170 deletions(-) diff --git a/test/player_test.c b/test/player_test.c index 0a7454d..1e7d55f 100644 --- a/test/player_test.c +++ b/test/player_test.c @@ -79,9 +79,6 @@ enum { CURRENT_STATUS_DISPLAY_MODE, CURRENT_STATUS_DISPLAY_ROTATION, CURRENT_STATUS_DISPLAY_VISIBLE, - CURRENT_STATUS_DISPLAY_ROI_MODE, - CURRENT_STATUS_DISPLAY_DST_ROI, - CURRENT_STATUS_DISPLAY_SRC_CROP, CURRENT_STATUS_SUBTITLE_FILENAME, CURRENT_STATUS_AUDIO_EQUALIZER, CURRENT_STATUS_PLAYBACK_RATE, @@ -1544,7 +1541,7 @@ static void get_display_rotation() { player_display_rotation_e rotation = 0; player_get_display_rotation(g_player[0], &rotation); - g_print(" ==> [Player_Test] X11 Display rotation: [%d ] \n", rotation); + g_print(" ==> [Player_Test] Video Overlay Display rotation: [%d ] \n", rotation); } static void set_display_visible(bool visible) @@ -1556,78 +1553,7 @@ static void set_display_visible(bool visible) static void get_display_visible(bool * visible) { player_is_display_visible(g_player[0], visible); - g_print(" ==> [Player_Test] X11 Display Visible = %d\n", *visible); -} - -static void set_display_dst_roi(int x, int y, int w, int h) -{ -#if 0 - if (player_set_x11_display_dst_roi(g_player[0], x, y, w, h) != PLAYER_ERROR_NONE) - g_print("failed to player_set_x11_display_dst_roi\n"); - else - g_print(" ==> [Player_Test] set X11 Display DST ROI (x:%d, y:%d, w:%d, h:%d)\n", x, y, w, h); -#endif -} - -static void get_display_dst_roi() -{ -#if 0 - int x = 0; - int y = 0; - int w = 0; - int h = 0; - - if (player_get_x11_display_dst_roi(g_player[0], &x, &y, &w, &h) != PLAYER_ERROR_NONE) - g_print("failed to player_get_x11_display_dst_roi\n"); - else - g_print(" ==> [Player_Test] got X11 Display DST ROI (x:%d, y:%d, w:%d, h:%d)\n", x, y, w, h); -#endif -} - -static void set_display_roi_mode(int mode) -{ -#if 0 - if (player_set_x11_display_roi_mode(g_player[0], (player_display_roi_mode_e) mode) != PLAYER_ERROR_NONE) - g_print("failed to player_set_x11_display_roi_mode\n"); - else - g_print(" ==> [Player_Test] set X11 Display ROI mode (%d)\n", mode); -#endif -} - -static void get_display_roi_mode() -{ -#if 0 - player_display_roi_mode_e mode; - if (player_get_x11_display_roi_mode(g_player[0], &mode) != PLAYER_ERROR_NONE) - g_print("failed to player_get_x11_display_roi_mode\n"); - else - g_print(" ==> [Player_Test] got X11 Display ROI mode (%d)\n", mode); -#endif -} - -static void set_display_src_crop(int x, int y, int w, int h) -{ -#if 0 - if (player_set_x11_display_src_crop(g_player[0], x, y, w, h) != PLAYER_ERROR_NONE) - g_print("failed to player_set_x11_display_src_crop\n"); - else - g_print(" ==> [Player_Test] set X11 Display SRC CROP (x:%d, y:%d, w:%d, h:%d)\n", x, y, w, h); -#endif -} - -static void get_display_src_crop() -{ -#if 0 - int x = 0; - int y = 0; - int w = 0; - int h = 0; - - if (player_get_x11_display_src_crop(g_player[0], &x, &y, &w, &h) != PLAYER_ERROR_NONE) - g_print("failed to player_get_x11_display_src_crop\n"); - else - g_print(" ==> [Player_Test] got X11 Display SRC CROP (x:%d, y:%d, w:%d, h:%d)\n", x, y, w, h); -#endif + g_print(" ==> [Player_Test] Video Overlay Display Visible = %d\n", *visible); } static void input_subtitle_filename(char *subtitle_filename) @@ -1825,18 +1751,6 @@ void _interpret_main_menu(char *cmd) } else if (strncmp(cmd, "w", 1) == 0) { bool visible; get_display_visible(&visible); - } else if (strncmp(cmd, "x", 1) == 0) { - g_menu_state = CURRENT_STATUS_DISPLAY_DST_ROI; - } else if (strncmp(cmd, "y", 1) == 0) { - get_display_dst_roi(); - } else if (strncmp(cmd, "M", 1) == 0) { - g_menu_state = CURRENT_STATUS_DISPLAY_ROI_MODE; - } else if (strncmp(cmd, "N", 1) == 0) { - get_display_roi_mode(); - } else if (strncmp(cmd, "F", 1) == 0) { - g_menu_state = CURRENT_STATUS_DISPLAY_SRC_CROP; - } else if (strncmp(cmd, "G", 1) == 0) { - get_display_src_crop(); } else if (strncmp(cmd, "A", 1) == 0) { g_menu_state = CURRENT_STATUS_SUBTITLE_FILENAME; } else if (strncmp(cmd, "C", 1) == 0) { @@ -1940,9 +1854,9 @@ void display_sub_basic() g_print("[display] v. Set display visible\t"); g_print("w. Get display visible\n"); g_print("[display] ds. Change display surface type\n"); - g_print("[x display] r. Set display mode\t"); + g_print("[overlay display] r. Set display mode\t"); g_print("s. Get display mode\n"); - g_print("[x display] t. Set display Rotation\t"); + g_print("[overlay display] t. Set display Rotation\t"); g_print("[Track] tl. Get Track language info(single only)\n"); g_print("[subtitle] A. Set(or change) subtitle path\n"); g_print("[subtitle] ss. Select(or change) subtitle track\n"); @@ -1981,17 +1895,11 @@ static void displaymenu() } else if (g_menu_state == CURRENT_STATUS_DISPLAY_SURFACE_CHANGE) { g_print("*** input display surface type.(0: X surface, 1: EVAS surface) \n"); } else if (g_menu_state == CURRENT_STATUS_DISPLAY_MODE) { - g_print("*** input display mode value.(0: LETTER BOX, 1: ORIGIN SIZE, 2: FULL_SCREEN, 3: CROPPED_FULL, 4: ORIGIN_OR_LETTER, 5: ROI) \n"); + g_print("*** input display mode value.(0: LETTER BOX, 1: ORIGIN SIZE, 2: FULL_SCREEN, 3: CROPPED_FULL, 4: ORIGIN_OR_LETTER) \n"); } else if (g_menu_state == CURRENT_STATUS_DISPLAY_ROTATION) { g_print("*** input display rotation value.(0: NONE, 1: 90, 2: 180, 3: 270, 4:F LIP_HORZ, 5: FLIP_VERT ) \n"); } else if (g_menu_state == CURRENT_STATUS_DISPLAY_VISIBLE) { g_print("*** input display visible value.(0: HIDE, 1: SHOW) \n"); - } else if (g_menu_state == CURRENT_STATUS_DISPLAY_ROI_MODE) { - g_print("*** input display roi mode.(0: FULL_SCREEN, 1: LETTER BOX)\n"); - } else if (g_menu_state == CURRENT_STATUS_DISPLAY_DST_ROI) { - g_print("*** input display roi value sequentially.(x, y, w, h)\n"); - } else if (g_menu_state == CURRENT_STATUS_DISPLAY_SRC_CROP) { - g_print("*** input display source crop value sequentially.(x, y, w, h)\n"); } else if (g_menu_state == CURRENT_STATUS_SUBTITLE_FILENAME) { g_print(" *** input subtitle file path.\n"); } else if (g_menu_state == CURRENT_STATUS_AUDIO_EQUALIZER) { @@ -2133,79 +2041,6 @@ static void interpret(char *cmd) reset_menu_state(); } break; - case CURRENT_STATUS_DISPLAY_DST_ROI: - { - int value = atoi(cmd); - static int roi_x = 0; - static int roi_y = 0; - static int roi_w = 0; - static int roi_h = 0; - static int cnt = 0; - switch (cnt) { - case 0: - roi_x = value; - cnt++; - break; - case 1: - roi_y = value; - cnt++; - break; - case 2: - roi_w = value; - cnt++; - break; - case 3: - cnt = 0; - roi_h = value; - set_display_dst_roi(roi_x, roi_y, roi_w, roi_h); - roi_x = roi_y = roi_w = roi_h = 0; - reset_menu_state(); - break; - default: - break; - } - } - break; - case CURRENT_STATUS_DISPLAY_SRC_CROP: - { - int value = atoi(cmd); - static int crop_x = 0; - static int crop_y = 0; - static int crop_w = 0; - static int crop_h = 0; - static int crop_cnt = 0; - switch (crop_cnt) { - case 0: - crop_x = value; - crop_cnt++; - break; - case 1: - crop_y = value; - crop_cnt++; - break; - case 2: - crop_w = value; - crop_cnt++; - break; - case 3: - crop_cnt = 0; - crop_h = value; - set_display_src_crop(crop_x, crop_y, crop_w, crop_h); - crop_x = crop_y = crop_w = crop_h = 0; - reset_menu_state(); - break; - default: - break; - } - } - break; - case CURRENT_STATUS_DISPLAY_ROI_MODE: - { - int value = atoi(cmd); - set_display_roi_mode(value); - reset_menu_state(); - } - break; case CURRENT_STATUS_SUBTITLE_FILENAME: { input_subtitle_filename(cmd); -- 2.7.4