From: Amlan Chowdhury Date: Mon, 20 Jun 2016 06:17:24 +0000 (+0600) Subject: [TBT][Video View][TSAM-4917][Wearable Circle video full screen window issue, problem... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F75489%2F1;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][Video View][TSAM-4917][Wearable Circle video full screen window issue, problem partially resolved for emulator] Signed-off-by: Amlan Chowdhury Change-Id: Ib038f28ca2aa4bd6f4564d2d49d85508ce0b9f6f --- diff --git a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk index d4cd5a2..82dbcdc 100644 Binary files a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk index fabbd8b..b0e2486 100644 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ diff --git a/tbtcoreapp/src/view/tbt-local-view.c b/tbtcoreapp/src/view/tbt-local-view.c index a4eaa99..6abb8b7 100644 --- a/tbtcoreapp/src/view/tbt-local-view.c +++ b/tbtcoreapp/src/view/tbt-local-view.c @@ -223,12 +223,12 @@ local_view *local_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Ite - Evas *evas_canvas = evas_object_evas_get(this->video_rect); - Evas_Object *bg = evas_object_rectangle_add(evas_canvas); - evas_object_render_op_set(bg, EVAS_RENDER_COPY); - evas_object_color_set(bg, 0, 0, 0, 0); - evas_object_resize(bg, width*0.23, height*0.23); // covers full canvas - evas_object_show(bg); + //Evas *evas_canvas = evas_object_evas_get(this->video_rect); + //Evas_Object *bg = evas_object_rectangle_add(evas_canvas); + //evas_object_render_op_set(bg, EVAS_RENDER_COPY); + //evas_object_color_set(bg, 0, 0, 0, 0); + //evas_object_resize(bg, width*0.23, height*0.23); // covers full canvas + //evas_object_show(bg); #endif @@ -282,6 +282,8 @@ static void start_player(local_view *this) DBG( "player_get_state fail > Error = %s", get_local_view_error(result)); if(state != PLAYER_STATE_PLAYING) { + result = player_set_display_mode(this->player, PLAYER_DISPLAY_MODE_ORIGIN_SIZE); + RETM_IF(result != PLAYER_ERROR_NONE, "player_set_display_mode fail > Error = %s", get_local_view_error(result)); result = player_set_display_visible(this->player, true); RETM_IF(result != PLAYER_ERROR_NONE, "player_set_display_visible fail > Error = %s", get_local_view_error(result)); result = player_start(this->player); @@ -390,9 +392,9 @@ static player_h create_player(local_view *this) RETVM_IF(result != PLAYER_ERROR_NONE, NULL, "player_set_looping fail > Error = %s", get_local_view_error(result)); result = player_set_uri(player, get_resource_path(this->view->tbt_info->file_name)); RETVM_IF(result != PLAYER_ERROR_NONE, NULL, "player_set_uri fail > Error = %s", get_local_view_error(result)); - #ifdef DEVICE_TYPE_MOBILE + #ifdef DEVICE_TYPE_MOBILE result = player_set_display(player, PLAYER_DISPLAY_TYPE_EVAS, GET_DISPLAY(this->video_rect)); - #else + #else result = player_set_display(player, PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(this->video_rect)); #endif RETVM_IF(result != PLAYER_ERROR_NONE, NULL, "player_set_display fail > Error = %s", get_local_view_error(result)); @@ -579,42 +581,32 @@ static char* get_local_view_error(player_error_e error_state) switch(error_state) { + case PLAYER_ERROR_NONE: + return "PLAYER_ERROR_NONE"; case PLAYER_ERROR_OUT_OF_MEMORY: - return "PLAYER_ERROR_OUT_OF_MEMORY"; - + return "PLAYER_ERROR_OUT_OF_MEMORY"; case PLAYER_ERROR_INVALID_PARAMETER: - return "PLAYER_ERROR_INVALID_PARAMETER"; - + return "PLAYER_ERROR_INVALID_PARAMETER"; case PLAYER_ERROR_NO_SUCH_FILE: return "PLAYER_ERROR_NO_SUCH_FILE"; - - case PLAYER_ERROR_FILE_NO_SPACE_ON_DEVICE: - return "PLAYER_ERROR_FILE_NO_SPACE_ON_DEVICE"; - case PLAYER_ERROR_INVALID_OPERATION: return "PLAYER_ERROR_INVALID_OPERATION"; - + case PLAYER_ERROR_FILE_NO_SPACE_ON_DEVICE: + return "PLAYER_ERROR_FILE_NO_SPACE_ON_DEVICE"; case PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE: return "PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE"; - case PLAYER_ERROR_SEEK_FAILED: return "PLAYER_ERROR_SEEK_FAILED"; - case PLAYER_ERROR_INVALID_STATE: return "PLAYER_ERROR_INVALID_STATE"; - case PLAYER_ERROR_NOT_SUPPORTED_FILE: return "PLAYER_ERROR_NOT_SUPPORTED_FILE"; - case PLAYER_ERROR_INVALID_URI: return "PLAYER_ERROR_INVALID_URI"; - case PLAYER_ERROR_SOUND_POLICY: return "PLAYER_ERROR_SOUND_POLICY"; - case PLAYER_ERROR_CONNECTION_FAILED: return "PLAYER_ERROR_CONNECTION_FAILED"; - case PLAYER_ERROR_VIDEO_CAPTURE_FAILED: return "PLAYER_ERROR_VIDEO_CAPTURE_FAILED"; case PLAYER_ERROR_DRM_EXPIRED: @@ -629,6 +621,10 @@ switch(error_state) return "PLAYER_ERROR_RESOURCE_LIMIT"; case PLAYER_ERROR_PERMISSION_DENIED: return "PLAYER_ERROR_PERMISSION_DENIED"; + case PLAYER_ERROR_SERVICE_DISCONNECTED: + return "PLAYER_ERROR_SERVICE_DISCONNECTED"; + case PLAYER_ERROR_BUFFER_SPACE: + return "PLAYER_ERROR_BUFFER_SPACE"; default: return "ERROR_NOT_FOUND";