From ab8e0bfa37fce7504a209acff61196046de0431f Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Thu, 30 Jun 2016 19:04:43 +0900 Subject: [PATCH] apply tizen build option naming rule EVAS_RENDERER_SUPPORT to TIZEN_FEATURE_EVAS_RENDERER Change-Id: If394a92a3d5b27fb8f96747eb3064fea7ee37fce --- CMakeLists.txt | 12 ++++++------ packaging/capi-media-player.spec | 4 ++-- src/player.c | 24 ++++++++++++------------ test/player_es_push_test.c | 2 +- test/player_test.c | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) mode change 100755 => 100644 src/player.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 45f8809..dfe1d38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,11 +16,11 @@ ENDIF (TIZEN_WEARABLE) SET(INC_COM_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}, ${INC_COM_DIR}) -IF (EVAS_RENDERER_SUPPORT) +IF (TIZEN_FEATURE_EVAS_RENDERER) SET(dependents "dlog glib-2.0 libtbm capi-media-tool capi-media-sound-manager capi-base-common mused mm-common tizen-extension-client evas ecore elementary mm-evas-renderer") -ELSE (EVAS_RENDERER_SUPPORT) +ELSE (TIZEN_FEATURE_EVAS_RENDERER) SET(dependents "dlog glib-2.0 libtbm capi-media-tool capi-media-sound-manager capi-base-common mused mm-common tizen-extension-client evas ecore elementary") -ENDIF (EVAS_RENDERER_SUPPORT) +ENDIF (TIZEN_FEATURE_EVAS_RENDERER) SET(pc_dependents "libtbm capi-media-tool capi-base-common capi-media-sound-manager") INCLUDE(FindPkgConfig) @@ -41,9 +41,9 @@ IF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DTARGET") ENDIF("${ARCH}" STREQUAL "arm") -IF (EVAS_RENDERER_SUPPORT) - ADD_DEFINITIONS("-DEVAS_RENDERER_SUPPORT") -ENDIF(EVAS_RENDERER_SUPPORT) +IF (TIZEN_FEATURE_EVAS_RENDERER) + ADD_DEFINITIONS("-DTIZEN_FEATURE_EVAS_RENDERER") +ENDIF(TIZEN_FEATURE_EVAS_RENDERER) ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec index 0d4c9b8..c907699 100644 --- a/packaging/capi-media-player.spec +++ b/packaging/capi-media-player.spec @@ -64,9 +64,9 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -DTIZEN_TV=YES \ %endif %if "%{?profile}" == "tv" || "%{?profile}" == "wearable" - -DEVAS_RENDERER_SUPPORT=Off + -DTIZEN_FEATURE_EVAS_RENDERER=Off %else - -DEVAS_RENDERER_SUPPORT=On + -DTIZEN_FEATURE_EVAS_RENDERER=On %endif make %{?jobs:-j%jobs} diff --git a/src/player.c b/src/player.c old mode 100755 new mode 100644 index 5bcf7e2..7c58ac3 --- a/src/player.c +++ b/src/player.c @@ -40,7 +40,7 @@ #include "player_private.h" #include "player_display.h" #include "player_msg.h" -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER #include #endif #define INVALID_SOCKET -1 @@ -1406,7 +1406,7 @@ int player_destroy(player_h player) LOGD("ENTER"); player_msg_send(api, pc, ret_buf, ret); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (CALLBACK_INFO(pc) && EVAS_HANDLE(pc)) { player_unset_media_packet_video_frame_decoded_cb(player); if (mm_evas_renderer_destroy(&EVAS_HANDLE(pc)) != MM_ERROR_NONE) @@ -1505,7 +1505,7 @@ int player_unprepare(player_h player) if (!CALLBACK_INFO(pc)) return PLAYER_ERROR_INVALID_STATE; -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { player_unset_media_packet_video_frame_decoded_cb(player); if (mm_evas_renderer_destroy(&EVAS_HANDLE(pc)) != MM_ERROR_NONE) @@ -1788,7 +1788,7 @@ int player_start(player_h player) char *ret_buf = NULL; LOGD("ENTER"); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { ret = mm_evas_renderer_update_param(EVAS_HANDLE(pc)); if (ret != PLAYER_ERROR_NONE) @@ -2077,7 +2077,7 @@ int player_set_display(player_h player, player_display_type_e type, player_displ pc->wlclient = NULL; } } -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER else if (type == PLAYER_DISPLAY_TYPE_EVAS && !strcmp(object_type, "image")) { /* evas object surface */ LOGI("evas surface type"); @@ -2126,7 +2126,7 @@ int player_set_display_mode(player_h player, player_display_mode_e mode) char *ret_buf = NULL; LOGD("ENTER"); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { ret = mm_evas_renderer_set_geometry(EVAS_HANDLE(pc), mode); return ret; @@ -2148,7 +2148,7 @@ int player_get_display_mode(player_h player, player_display_mode_e * pmode) int mode = -1; LOGD("ENTER"); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { ret = mm_evas_renderer_get_geometry(EVAS_HANDLE(pc), &mode); *pmode = (player_display_mode_e) mode; @@ -2190,7 +2190,7 @@ int player_set_display_rotation(player_h player, player_display_rotation_e rotat char *ret_buf = NULL; LOGD("ENTER"); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { ret = mm_evas_renderer_set_rotation(EVAS_HANDLE(pc), rotation); return ret; @@ -2212,7 +2212,7 @@ int player_get_display_rotation(player_h player, player_display_rotation_e * pro int rotation = -1; LOGD("ENTER"); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { ret = mm_evas_renderer_get_rotation(EVAS_HANDLE(pc), &rotation); *protation = (player_display_rotation_e) rotation; @@ -2238,7 +2238,7 @@ int player_set_display_visible(player_h player, bool visible) char *ret_buf = NULL; LOGD("ENTER"); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { ret = mm_evas_renderer_set_visible(EVAS_HANDLE(pc), visible); return ret; @@ -2258,11 +2258,11 @@ int player_is_display_visible(player_h player, bool * pvisible) muse_player_api_e api = MUSE_PLAYER_API_IS_DISPLAY_VISIBLE; char *ret_buf = NULL; int value = -1; -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER bool visible = 0; #endif LOGD("ENTER"); -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER if (EVAS_HANDLE(pc)) { ret = mm_evas_renderer_get_visible(EVAS_HANDLE(pc), &visible); if (visible) diff --git a/test/player_es_push_test.c b/test/player_es_push_test.c index 076b116..4fa8a14 100644 --- a/test/player_es_push_test.c +++ b/test/player_es_push_test.c @@ -26,7 +26,7 @@ #define KEY_END "XF86Stop" -#define ES_DEFAULT_DIR_PATH "/home/owner/content/" +#define ES_DEFAULT_DIR_PATH "/home/owner/" #define ES_DEFAULT_H264_VIDEO_PATH ES_DEFAULT_DIR_PATH"Simpsons.h264" #define ES_DEFAULT_VIDEO_FORMAT_TYPE MEDIA_FORMAT_H264_SP #define ES_DEFAULT_VIDEO_FORMAT_WIDTH 1280 diff --git a/test/player_test.c b/test/player_test.c index 1e7d55f..ce94571 100644 --- a/test/player_test.c +++ b/test/player_test.c @@ -1431,7 +1431,7 @@ static void change_surface(int option) surface_type = PLAYER_DISPLAY_TYPE_OVERLAY; g_print("change surface type to X\n"); break; -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER case 1: /* EVAS surface */ surface_type = PLAYER_DISPLAY_TYPE_EVAS; -- 2.7.4