From: ABHISHEK JAIN <j.abhishek@samsung.com>
Date: Mon, 9 Sep 2019 07:07:35 +0000 (+0530)
Subject: [ITC][player][NonACR][DPTTIZEN-3148 Enable wearable TCs for EVAS display type]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13b71ac46bb8e128259dd6a1e94abf1e66270ef0;p=test%2Ftct%2Fnative%2Fapi.git

[ITC][player][NonACR][DPTTIZEN-3148 Enable wearable TCs for EVAS display type]

Change-Id: Ib0e8fbd0e71f1273e83718903fc9f8cac2fac63d
Signed-off-by: ABHISHEK JAIN <j.abhishek@samsung.com>
---

diff --git a/src/itc/player/ITs-player-common.c b/src/itc/player/ITs-player-common.c
index c3783d1c4..c54269ed1 100755
--- a/src/itc/player/ITs-player-common.c
+++ b/src/itc/player/ITs-player-common.c
@@ -388,14 +388,14 @@ void CreateEvasWindow()
 
 	g_pEvasObject = evas_object_image_add(g_pEvasCore);
 
-	evas_object_image_size_set(g_pEvasObject, 500, 500);
-	evas_object_image_fill_set(g_pEvasObject, 0, 0, 500, 500);
-	evas_object_resize(g_pEvasObject, 500, 500);
+	evas_object_image_size_set(g_pEvasObject, w, h);
+	evas_object_image_fill_set(g_pEvasObject, 0, 0, w, h);
+	evas_object_resize(g_pEvasObject, w, h);
 
 	elm_win_activate(g_pEvasWindow);
 	evas_object_show(g_pEvasWindow);
 }
-#endif // TIZENIOT
+#endif // For all profiles except TIZENIOT
 
 #if (defined(MOBILE) ||  defined(TIZENIOT) || defined(WEARABLE) || (defined(TV) && defined(_MEDIA_STREAM_API )) ) //Starts MOBILE or TIZENIOT or WEARABLE or TV
 /**
diff --git a/src/itc/player/ITs-player-common.h b/src/itc/player/ITs-player-common.h
index c94cba827..638849de5 100755
--- a/src/itc/player/ITs-player-common.h
+++ b/src/itc/player/ITs-player-common.h
@@ -59,6 +59,7 @@
 #define OPENGL_FEATURE "http://tizen.org/feature/opengles.version.2_0"
 #define SPHERICAL_VIDEO_FEATURE "http://tizen.org/feature/multimedia.player.spherical_video"
 #define AUDIO_OFFLOAD_FEATURE "http://tizen.org/feature/multimedia.player.audio_offload"
+#define SOUND_STREAM_FEATURE "http://tizen.org/feature/multimedia.player.stream_info"
 
 #define MEDIA_360_PATH 				"test_360.mp4"
 
diff --git a/src/itc/player/ITs-player-display.c b/src/itc/player/ITs-player-display.c
index 413a39689..cb1503732 100755
--- a/src/itc/player/ITs-player-display.c
+++ b/src/itc/player/ITs-player-display.c
@@ -249,21 +249,17 @@ int ITc_player_set_get_display_rotation_p(void)
 * @apicovered			player_set_display, player_set_display_visible,
 * @passcase				When it can set visibility of the x surface video display
 * @failcase				When it can not set visibility of the x surface video display
-* @precondition			The player display must be set as PLAYER_DISPLAY_TYPE_OVERLAY
+* @precondition			N/A
 * @postcondition		N/A
 */
 int ITc_player_set_display_visible_p(void)
 {
 	START_TEST;
 	int nRet = -1;
-	#if defined(MOBILE) || defined(TV)		//Starts MOBILE or TV
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
-	#endif	//End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-	#endif	//End WEARABLE
-
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
+	nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+	#endif	//End MOBILE or TV or WEARABLE
 
 	nRet = player_set_display_visible(g_player, true);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display_visible", PlayerGetError(nRet));
diff --git a/src/itc/player/ITs-player-stream-info.c b/src/itc/player/ITs-player-stream-info.c
index bcaba07ec..5aa29d0a0 100755
--- a/src/itc/player/ITs-player-stream-info.c
+++ b/src/itc/player/ITs-player-stream-info.c
@@ -27,10 +27,9 @@ bool g_bCallbackHit;
 
 static bool _check_sound_stream_feature(void)
 {
-#define _FEATURE_NAME_SOUND_STREAM "http://tizen.org/feature/multimedia.player.stream_info"
     bool supported = FALSE;
 
-    system_info_get_platform_bool(_FEATURE_NAME_SOUND_STREAM, &supported);
+    system_info_get_platform_bool(SOUND_STREAM_FEATURE, &supported);
 
     if (supported)
         return true;
@@ -324,7 +323,7 @@ int ITc_player_set_sound_stream_info_p(void)
 */
 int ITc_player_set_get_adaptive_variant_limit_p(void)
 {
-START_TEST;
+	START_TEST;
 
 	int nSetBandwidth = 500000, nSetWidth = 1920, nSetHeight = 1080;
 	int nGetBandwidth = 0, nGetWidth = 0, nGetHeight = 0;
diff --git a/src/itc/player/ITs-player-subtitle.c b/src/itc/player/ITs-player-subtitle.c
index 5e27a4c84..0eeae1171 100755
--- a/src/itc/player/ITs-player-subtitle.c
+++ b/src/itc/player/ITs-player-subtitle.c
@@ -154,8 +154,6 @@ static void PlayerSubtitleUpdatedCallback(unsigned long duration, char *text, vo
 	ecore_main_loop_quit();
 }
 
-
-
 /** @addtogroup itc-player-testcases
 *  @brief		Integration testcases for module player
 *  @ingroup		itc-player
@@ -196,14 +194,16 @@ int ITc_player_set_subtitle_position_offset_p(void)
 		PRINT_API_ERROR_IN_LOOP_MSG_SINGLE(InitializePlayerHandler);
 		return 1;
 	}
-	 #if defined(MOBILE) || defined(TV)		//Starts MOBILE or	TIZENIOT or TV
-	int nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
-	 #endif	 //End MOBILE or TV
-	#if defined( WEARABLE) ||  defined(TIZENIOT)	//Starts WEARABLE
-	int nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-	#endif	//WEARABLE	//End WEARABLE
+	int nRet = -1;
 
+	#if defined(MOBILE) || defined(TV) || defined( WEARABLE) //Starts MOBILE or WEARABLE or TV
+	nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
+	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+	#endif	 //End MOBILE or WEARABLE or TV
+	#if defined(TIZENIOT)	//Starts TIZENIOT
+	nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+	#endif	//WEARABLE	//End TIZENIOT
 
 	nRet = player_set_subtitle_path(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_subtitle_path", PlayerGetError(nRet));
@@ -309,14 +309,16 @@ int ITc_player_set_unset_subtitle_updated_cb_p(void)
 		PRINT_API_ERROR_IN_LOOP_MSG_SINGLE(InitializePlayerHandler);
 		return 1;
 	}
+	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV)		//Starts MOBILE or	TIZENIOT or TV
-	int nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
-	 #endif	 //End MOBILE or TIZENIOT or TV
-	#if defined(WEARABLE) ||  defined(TIZENIOT)	//Starts WEARABLE
-	int nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-	#endif	//WEARABLE	//End WEARABLE
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE)	//Starts MOBILE or WEARABLE or TV
+	nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+	#endif	 //End MOBILE or WEARABLE or TV
+	#if defined(TIZENIOT)	//Starts TIZENIOT
+	nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
+	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+	#endif	//WEARABLE	//End TIZENIOT
 
 	nRet = player_set_subtitle_path(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_subtitle_path", PlayerGetError(nRet));
@@ -380,5 +382,3 @@ int ITc_player_set_unset_subtitle_updated_cb_p(void)
 }
 
 
-
-
diff --git a/src/itc/player/ITs-player.c b/src/itc/player/ITs-player.c
index 026fe7b2a..a9e48ddf9 100755
--- a/src/itc/player/ITs-player.c
+++ b/src/itc/player/ITs-player.c
@@ -272,7 +272,7 @@ static void PlayerVideoCaptureCallback(unsigned char *data, int width, int heigh
 	g_bPlayerVideoCaptureCallback = true;
 	ecore_main_loop_quit();
 }
-#endif // TIZENIOT //For TIZENIOT
+#endif // End of Mobile or Wearable or TV
 
 //Callbacks
 
@@ -376,7 +376,7 @@ static void PlayerPreparedCallback(void *user_data)
 #endif // TIZENIOT
 }
 
-#if (defined(MOBILE) ||	 defined(TIZENIOT) || defined(WEARABLE) || (defined(TV) && defined(_MEDIA_STREAM_API )) ) //Starts MOBILE or	TIZENIOT or WEARABLE or TV
+#if (defined(MOBILE) ||	 defined(TIZENIOT) || defined(WEARABLE) || (defined(TV) && defined(_MEDIA_STREAM_API )) ) //Starts MOBILE or TIZENIOT or WEARABLE or TV
 
 //Callbacks
 
@@ -791,17 +791,14 @@ bool CheckOnlineStatus(char *media_path)
 
 bool CheckConnectionStatistics(connection_h connection, long long *size)
 {
-#define _FEATURE_NAME_WIFI      "http://tizen.org/feature/network.wifi"
-#define _FEATURE_NAME_TELEPHONY "http://tizen.org/feature/network.telephony"
-
 	long long rv = 0;
 	int err = CONNECTION_ERROR_NONE;
 	connection_type_e type = CONNECTION_TYPE_DISCONNECTED;
 	bool wifi_supported = false;
 	bool telepony_supported = false;
 
-	system_info_get_platform_bool(_FEATURE_NAME_WIFI, &wifi_supported);
-	system_info_get_platform_bool(_FEATURE_NAME_TELEPHONY, &telepony_supported);
+	system_info_get_platform_bool(WIFI_FEATURE, &wifi_supported);
+	system_info_get_platform_bool(TELEPHONY_FEATURE, &telepony_supported);
 
 	if (wifi_supported) {
 		type = CONNECTION_TYPE_WIFI;
@@ -1350,14 +1347,10 @@ int ITc_player_get_streaming_download_progress_p(void)
 	player_state_e state;
 
 	int nRet = -1;
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or TV or WEARABLE
 
 	char pstrValue[CONFIG_VALUE_LEN_MAX] = {0,};
 	if ( true == GetValueFromConfigFile("PLAYER_HTTP_STREAMING_URL", pstrValue, API_NAMESPACE))
@@ -1747,15 +1740,10 @@ int ITc_player_pause_p(void)
 	player_state_e state;
 	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
-
+	#endif //End MOBILE or TV or WEARABLE
 
 	sleep(2);
 
@@ -1966,16 +1954,10 @@ int ITc_player_set_unset_completed_cb_p(void)
 	int nRet = player_set_completed_cb(g_player, PlayerCompletedCallback, NULL);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_completed_cb", PlayerGetError(nRet));
 
-
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
-
+	#endif //End MOBILE or TV or WEARABLE
 
 	if ( InitializePlayerHandler(true, 1) == false )
 	{
@@ -2050,14 +2032,10 @@ int ITc_player_set_unset_media_packet_video_frame_decoded_cb_p(void)
 	int nRet = player_set_media_packet_video_frame_decoded_cb(g_player, PlayerMediaPacketVideoFrameDecodedCallback, NULL);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_media_packet_video_frame_decoded_cb", PlayerGetError(nRet));
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	if ( InitializePlayerHandler(true, 1) == false )
 	{
@@ -2148,15 +2126,10 @@ int ITc_player_prepare_async_p(void)
 
 	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
-
+	#endif //End MOBILE or TV or WEARABLE
 	g_bPlayerPreparedCallback = false;
 
 	nRet = player_prepare_async(g_player, PlayerPreparedCallback, NULL);
@@ -2412,15 +2385,10 @@ int ITc_player_get_track_count_p(void)
 	int nCount = 0;
 	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
-
+	#endif	//End MOBILE or TV or WEARABLE
 	sleep(2);
 
 	if ( InitializePlayerHandler(true, 1) != true )
@@ -2483,15 +2451,10 @@ int ITc_player_get_current_track_p(void)
 	int nCount = 0, nIndex = 0;
 	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
-
+	#endif	//End MOBILE or TV or WEARABLE
 	sleep(2);
 
 	if ( InitializePlayerHandler(true, 1) != true )
@@ -2567,15 +2530,10 @@ int ITc_player_get_track_language_code_p(void)
 	char *pszLangCode = NULL;
 	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
-
+	#endif	//End MOBILE or TV or WEARABLE
 	sleep(2);
 
 	if ( InitializePlayerHandler(true, 1) != true )
@@ -2650,15 +2608,10 @@ int ITc_player_select_track_p(void)
 	int nCount = 0, nIndex = 0;
 	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//End MOBILE or TV
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
-
+	#endif	//End MOBILE or TV or WEARABLE
 	sleep(2);
 
 	if ( InitializePlayerHandler(true, 1) != true )
@@ -3109,14 +3062,10 @@ int ITc_player_capture_video_p(void)
 
 	int nRet = -1;
 
-	#if defined(MOBILE) || defined(TV) //Starts MOBILE or TV
+	#if defined(MOBILE) || defined(TV) || defined(WEARABLE) //Starts MOBILE or TV or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
-	#endif	//MOBILE	//End MOBILE or TV
-	#if defined(WEARABLE) //Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-	#endif	//WEARABLE	//End WEARABLE
-	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-
+		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+	#endif	//End MOBILE or TV or WEARABLE
 	sleep(2);
 
 	nRet = player_set_uri(g_player, pPath);
@@ -3128,7 +3077,7 @@ int ITc_player_capture_video_p(void)
 		{
 			if(nRet != PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE)
 			{
-				FPRINTF("[Line : %d][%s] player_set_uri API call returned mismatch %s error for unsupported internet feature\\n", __LINE__, API_NAMESPACE,	PlayerGetError(nRet));
+				FPRINTF("[Line : %d][%s] player_set_uri API call returned mismatch %s error for unsupported internet feature\\n", __LINE__, API_NAMESPACE, PlayerGetError(nRet));
 				return 1;
 			}
 		}
@@ -3247,13 +3196,10 @@ int ITc_player_set_unset_video_stream_changed_cb_p(void)
 		return 1;
 	}
 
-	#if defined(MOBILE)		//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_EVAS, g_pEvasObject);
-	#endif //End MOBILE
-	#if defined(WEARABLE)	//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_OVERLAY, g_pEvasWindow);
-	#endif	//WEARABLE	//End WEARABLE
-	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_video_stream_changed_cb(g_player, PlayerVideoStreamChangedCallback, NULL);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_video_stream_changed_cb", PlayerGetError(nRet));
@@ -3721,14 +3667,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_signed_le_deinterle
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined (WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -3854,14 +3796,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_signed_le_no_sync_a
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined (WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -3987,14 +3925,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_signed_be_deinterle
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -4120,14 +4054,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_signed_be_no_sync_a
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -4252,14 +4182,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_float_deinterleave_
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -4384,14 +4310,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_float_no_sync_and_d
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -4517,14 +4439,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_unsigned_le_deinter
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -4650,14 +4568,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_unsigned_le_no_sync
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -4783,14 +4697,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_unsigned_be_no_sync
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));
@@ -4916,14 +4826,10 @@ int ITc_player_set_unset_media_packet_audio_frame_decoded_cb_unsigned_be_deinter
 		return 1;
 	}
 
-	#if defined(MOBILE)	//Starts MOBILE
+	#if defined(MOBILE) || defined(WEARABLE)	//Starts MOBILE or WEARABLE
 		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasObject));
 		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif //End MOBILE
-	#ifdef WEARABLE		//Starts WEARABLE
-		nRet = player_set_display(g_player, PLAYER_DISPLAY_TYPE_NONE, GET_DISPLAY(g_pEvasWindow));
-		PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_display", PlayerGetError(nRet));
-	#endif	//WEARABLE	//End WEARABLE
+	#endif //End MOBILE or WEARABLE
 
 	nRet = player_set_uri(g_player, pPath);
 	PRINT_RESULT(PLAYER_ERROR_NONE, nRet, "player_set_uri", PlayerGetError(nRet));