From: Eunhae Choi Date: Wed, 12 Oct 2016 01:23:30 +0000 (+0900) Subject: [v0.3.28] do not tbm bo import if tsurf exist X-Git-Tag: accepted/tizen/common/20161012.154139^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fbf871f4b03ade89df7706b574c972f02394b13;p=platform%2Fcore%2Fapi%2Fplayer.git [v0.3.28] do not tbm bo import if tsurf exist Change-Id: I967b973c8aae444250de602df064259264bf72a6 --- diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec index ff558b9..7dfe308 100644 --- a/packaging/capi-media-player.spec +++ b/packaging/capi-media-player.spec @@ -1,6 +1,6 @@ Name: capi-media-player Summary: A Media Player API -Version: 0.3.27 +Version: 0.3.28 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/player.c b/src/player.c index d5b2342..7e5a33d 100644 --- a/src/player.c +++ b/src/player.c @@ -681,15 +681,16 @@ static void __media_packet_video_frame_cb_handler(callback_cb_info_s * cb_info, return; } - for (i = 0; i < 4; i++) { - if (key[i]) { - bo_num++; - bo[i] = tbm_bo_import(cb_info->bufmgr, key[i]); - } - } tsurf_data = __player_get_tsurf_from_list(cb_info, key[0], sinfo); if (!tsurf_data) { + for (i = 0; i < 4; i++) { + if (key[i]) { + bo_num++; + bo[i] = tbm_bo_import(cb_info->bufmgr, key[i]); + } + } + tsurf_data = g_new(player_tsurf_info_t, 1); if (!tsurf_data) { LOGE("failed to alloc tsurf info"); @@ -1015,9 +1016,10 @@ gboolean _player_event_job_function(void *user_data) /* remove event from list */ g_mutex_lock(&data->cb_info->event_queue.idle_ev_mutex); - LOGD("remove idle event %p, %p", data, data->cb_info->event_queue.idle_ev_list); - if (data->cb_info->event_queue.idle_ev_list) + if (data->cb_info->event_queue.idle_ev_list) { + LOGD("remove idle event %p, %p", data, data->cb_info->event_queue.idle_ev_list); data->cb_info->event_queue.idle_ev_list = g_list_remove(data->cb_info->event_queue.idle_ev_list, (gpointer)data); + } g_mutex_unlock(&data->cb_info->event_queue.idle_ev_mutex); if (data->cb_info->user_cb[ev])