[0.6.58] modify buffering msg handling

Change-Id: I0cacf09a7deeba951f807368efe338dd28e8a5a2

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 9286b7b..b88cefa 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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;