diff options
| author | Eunhae Choi <eunhae1.choi@samsung.com> | 2017-08-23 16:52:48 +0900 |
|---|---|---|
| committer | Eunhae Choi <eunhae1.choi@samsung.com> | 2017-08-23 18:04:30 +0900 |
| commit | 3b0091e7b3c835fd0656c5e274232758927acb48 (patch) | |
| tree | 94cee4c0e4397a9c555e93dd19707d44422c762f | |
| parent | 14a5f633972f49fcc161990a973e6266cb60a97a (diff) | |
| download | libmm-player-accepted/tizen_3.0_ivi.tar.gz libmm-player-accepted/tizen_3.0_ivi.tar.bz2 libmm-player-accepted/tizen_3.0_ivi.zip | |
[0.6.58] modify buffering msg handlingsubmit/tizen_3.0/20170823.092442accepted/tizen/3.0/wearable/20170824.221436accepted/tizen/3.0/tv/20170824.221432accepted/tizen/3.0/mobile/20170824.221440accepted/tizen/3.0/ivi/20170824.221448accepted/tizen/3.0/common/20170825.070106accepted/tizen_3.0_ivi
Change-Id: I0cacf09a7deeba951f807368efe338dd28e8a5a2
| -rw-r--r-- | packaging/libmm-player.spec | 2 | ||||
| -rw-r--r-- | src/include/mm_player_priv.h | 1 | ||||
| -rw-r--r-- | src/mm_player_priv.c | 25 |
3 files changed, 16 insertions, 12 deletions
diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index 9286b7b..b88cefa 100644 --- a/packaging/libmm-player.spec +++ b/packaging/libmm-player.spec @@ -1,6 +1,6 @@ Name: libmm-player Summary: Multimedia Framework Player Library -Version: 0.6.57 +Version: 0.6.58 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_player_priv.h b/src/include/mm_player_priv.h index db96c1d..54bec62 100644 --- a/src/include/mm_player_priv.h +++ b/src/include/mm_player_priv.h @@ -688,7 +688,6 @@ typedef struct { gboolean sent_bos; /* timeout source for lazy pause */ - guint lazy_pause_event_id; guint resume_event_id; guint resumable_cancel_id; diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index 93e8b84..d00d5f4 100644 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -1294,9 +1294,21 @@ __mmplayer_gst_callback(GstBus *bus, GstMessage *msg, gpointer data) // @ break; } - if (!MMPLAYER_CMD_TRYLOCK(player)) { - LOGW("Fail to get cmd lock. skip msg handling."); - break; + if (player->pd_mode == MM_PLAYER_PD_MODE_URI) { + if (!MMPLAYER_CMD_TRYLOCK(player)) { + gint per = 0; + + LOGW("[PD mode] can't get cmd lock, only post buffering msg"); + + gst_message_parse_buffering(msg, &per); + LOGD("[PD mode][%s] buffering %d %%....", GST_OBJECT_NAME(GST_MESSAGE_SRC(msg)), per); + + msg_param.connection.buffering = per; + MMPLAYER_POST_MSG(player, MM_MESSAGE_BUFFERING, &msg_param); + break; + } + } else { + MMPLAYER_CMD_LOCK(player); } __mmplayer_update_buffer_setting(player, msg); @@ -8734,13 +8746,6 @@ _mmplayer_destroy(MMHandleType handle) // @ if (MM_ERROR_NONE != _mmplayer_resource_manager_deinit(&player->resource_manager)) LOGE("failed to deinitialize resource manager\n"); -#ifdef USE_LAZY_PAUSE - if (player->lazy_pause_event_id) { - __mmplayer_remove_g_source_from_context(player->context.global_default, player->lazy_pause_event_id); - player->lazy_pause_event_id = 0; - } -#endif - if (player->resume_event_id) { g_source_remove(player->resume_event_id); player->resume_event_id = 0; |