From 68bde0f36e78554f6e9266021f8fb58cb60fe0d1 Mon Sep 17 00:00:00 2001 From: NAMJEONGYOON Date: Fri, 28 Oct 2016 15:30:49 +0900 Subject: [PATCH] [UTC][player][ACR-809][add evas display type] Change-Id: I8dcf3dba9ad7ca4dc562fac0f642764617927e55 --- src/utc/player/tct-player-core_common_iot.h | 2 + src/utc/player/tct-player-core_mobile.h | 2 + src/utc/player/tct-player-core_wearable.h | 2 + src/utc/player/utc-media-player-display.c | 99 +++++++++++++++++++++++++---- 4 files changed, 91 insertions(+), 14 deletions(-) diff --git a/src/utc/player/tct-player-core_common_iot.h b/src/utc/player/tct-player-core_common_iot.h index cefc97c..7b982dd 100755 --- a/src/utc/player/tct-player-core_common_iot.h +++ b/src/utc/player/tct-player-core_common_iot.h @@ -124,6 +124,7 @@ extern int utc_player_select_track_n(void); extern int utc_media_player_get_video_size_p(void); extern int utc_media_player_get_video_size_n(void); extern int utc_media_player_set_display_p(void); +extern int utc_media_player_set_display_p2(void); extern int utc_media_player_set_display_n(void); extern int utc_media_player_capture_video_p(void); extern int utc_media_player_capture_video_n(void); @@ -299,6 +300,7 @@ testcase tc_array[] = { {"utc_media_player_get_video_size_p", utc_media_player_get_video_size_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_get_video_size_n", utc_media_player_get_video_size_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_set_display_p", utc_media_player_set_display_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, + {"utc_media_player_set_display_p2", utc_media_player_set_display_p2, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_set_display_n", utc_media_player_set_display_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_capture_video_p", utc_media_player_capture_video_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_capture_video_n", utc_media_player_capture_video_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, diff --git a/src/utc/player/tct-player-core_mobile.h b/src/utc/player/tct-player-core_mobile.h index cefc97c..7b982dd 100755 --- a/src/utc/player/tct-player-core_mobile.h +++ b/src/utc/player/tct-player-core_mobile.h @@ -124,6 +124,7 @@ extern int utc_player_select_track_n(void); extern int utc_media_player_get_video_size_p(void); extern int utc_media_player_get_video_size_n(void); extern int utc_media_player_set_display_p(void); +extern int utc_media_player_set_display_p2(void); extern int utc_media_player_set_display_n(void); extern int utc_media_player_capture_video_p(void); extern int utc_media_player_capture_video_n(void); @@ -299,6 +300,7 @@ testcase tc_array[] = { {"utc_media_player_get_video_size_p", utc_media_player_get_video_size_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_get_video_size_n", utc_media_player_get_video_size_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_set_display_p", utc_media_player_set_display_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, + {"utc_media_player_set_display_p2", utc_media_player_set_display_p2, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_set_display_n", utc_media_player_set_display_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_capture_video_p", utc_media_player_capture_video_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_capture_video_n", utc_media_player_capture_video_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, diff --git a/src/utc/player/tct-player-core_wearable.h b/src/utc/player/tct-player-core_wearable.h index 0cfff1b..6e55419 100755 --- a/src/utc/player/tct-player-core_wearable.h +++ b/src/utc/player/tct-player-core_wearable.h @@ -55,6 +55,7 @@ extern int utc_media_player_unset_subtitle_updated_cb_n(void); extern int utc_media_player_get_video_size_p(void); extern int utc_media_player_get_video_size_n(void); extern int utc_media_player_set_display_p(void); +extern int utc_media_player_set_display_p2(void); extern int utc_media_player_set_display_n(void); extern int utc_media_player_set_display_n2(void); extern int utc_media_player_capture_video_p(void); @@ -253,6 +254,7 @@ testcase tc_array[] = { {"utc_media_player_get_video_size_p", utc_media_player_get_video_size_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_get_video_size_n", utc_media_player_get_video_size_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_set_display_p", utc_media_player_set_display_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, + {"utc_media_player_set_display_p2", utc_media_player_set_display_p2, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_set_display_n", utc_media_player_set_display_n, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_set_display_n2", utc_media_player_set_display_n2, utc_media_player_display_startup, utc_media_player_display_cleanup}, {"utc_media_player_capture_video_p", utc_media_player_capture_video_p, utc_media_player_display_startup, utc_media_player_display_cleanup}, diff --git a/src/utc/player/utc-media-player-display.c b/src/utc/player/utc-media-player-display.c index 4baf87c..c952d7a 100755 --- a/src/utc/player/utc-media-player-display.c +++ b/src/utc/player/utc-media-player-display.c @@ -33,6 +33,7 @@ static bool _is_pass = false; static GMainLoop *g_mainloop = NULL; static Evas_Object *g_win = NULL; +static Evas_Object *g_eo = NULL; static gboolean timeout_func(gpointer data) { @@ -78,6 +79,49 @@ static void destroy_window() evas_object_del(g_win); g_win = NULL; } + + if (g_eo) { + evas_object_del(g_eo); + g_eo = NULL; + } +} + +void create_evas_window() +{ + destroy_window(); /* destroy window in case the clean_up is not called */ + + Evas *evas = NULL; + int w = 0; + int h = 0; + + /* create window */ + g_win = elm_win_util_standard_add("player_tc", "player_tc"); + if (g_win) + { + elm_win_borderless_set(g_win, EINA_TRUE); + evas_object_smart_callback_add(g_win, "delete, request", win_del, NULL); + elm_win_screen_size_get(g_win, NULL, NULL, &w, &h); + evas_object_resize(g_win, w, h); + elm_win_autodel_set(g_win, EINA_TRUE); + } else { + PRINT_UTC_LOG("[Line : %d][%s] fail to create window\\n", __LINE__, API_NAMESPACE); + } + + evas = evas_object_evas_get(g_win); + if (!evas) + { + FPRINTF("[Line: %d][%s] fail to get evas", __LINE__, API_NAMESPACE); + return; + } + + g_eo = evas_object_image_add(evas); + + evas_object_image_size_set(g_eo, 500, 500); + evas_object_image_fill_set(g_eo, 0, 0, 500, 500); + evas_object_resize(g_eo, 500, 500); + + elm_win_activate(g_win); + evas_object_show(g_win); } static void create_window() @@ -90,7 +134,7 @@ static void create_window() g_win = elm_win_util_standard_add("player_tc", "player_tc"); if (g_win) { elm_win_borderless_set(g_win, EINA_TRUE); - evas_object_smart_callback_add(g_win, "delete,request",win_del, NULL); + evas_object_smart_callback_add(g_win, "delete, request", win_del, NULL); elm_win_screen_size_get(g_win, NULL, NULL, &w, &h); evas_object_resize(g_win, w, h); elm_win_autodel_set(g_win, EINA_TRUE); @@ -109,18 +153,18 @@ static void create_window() void utc_media_player_display_startup(void) { elm_init(0, NULL); - char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; - if ( true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE )) - { - PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received = %s\\n", __LINE__, API_NAMESPACE, pszValue); - unsigned int size_of_path = strlen(pszValue) + strlen(media) + 6; - media_path = (char*)malloc(size_of_path); - snprintf(media_path, size_of_path, "%s/res/%s", pszValue, media); - } - else - { - PRINT_UTC_LOG("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); - } + char pszValue[CONFIG_VALUE_LEN_MAX] = {0,}; + if ( true == GetValueForTCTSetting("DEVICE_SUITE_TARGET_30", pszValue, API_NAMESPACE )) + { + PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received = %s\\n", __LINE__, API_NAMESPACE, pszValue); + unsigned int size_of_path = strlen(pszValue) + strlen(media) + 6; + media_path = (char*)malloc(size_of_path); + snprintf(media_path, size_of_path, "%s/res/%s", pszValue, media); + } + else + { + PRINT_UTC_LOG("[Line : %d][%s] GetValueForTCTSetting returned error for 'DEVICE_SUITE_TARGET_30'\\n", __LINE__, API_NAMESPACE); + } _is_broken = false; _is_pass = false; @@ -231,7 +275,7 @@ int utc_media_player_get_video_size_n(void) /** * @testcase utc_media_player_set_display_p * @since_tizen 2.3.1 - * @description Positive test case to set display handle + * @description Positive test case to set overlay display handle */ int utc_media_player_set_display_p(void) { @@ -256,6 +300,33 @@ int utc_media_player_set_display_p(void) } /** + * @testcase utc_media_player_set_display_p2 + * @since_tizen 3.0 + * @description Positive test case to set evas display handle + */ +int utc_media_player_set_display_p2(void) +{ + assert(!_is_broken); + + player_state_e state; + + player_get_state (player, &state); + if (state == PLAYER_STATE_READY) + player_unprepare(player); + + create_evas_window(); + int ret = player_set_display(player, PLAYER_DISPLAY_TYPE_EVAS, g_eo); + assert_eq(ret, PLAYER_ERROR_NONE); + + ret = player_prepare(player); + if (PLAYER_ERROR_NONE != ret) { + PRINT_UTC_LOG("[Line : %d][%s] player isn't prepared\\n", __LINE__, API_NAMESPACE); + } + + return 0; +} + +/** * @testcase utc_media_player_set_display_n * @since_tizen 2.3.1 * @description Negative test case to set display handle -- 2.7.4