[0.6.39] add pd state change timeout

if the network is disconnected, it will wait infinitely.

Change-Id: I7f4dc985626be18490ddf3dacf90a4f67f3841ce

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 84e9fb2..74ba6e8 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.38
+Version:    0.6.39
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_player_pd.c b/src/mm_player_pd.c
index 4a8851c..62c6ffe 100644 (file)
--- a/src/mm_player_pd.c
+++ b/src/mm_player_pd.c
@@ -25,6 +25,8 @@
 #include "mm_player_utils.h"
 #include "mm_player_priv.h"
 
+#define PD_STATE_CHANGE_TIMEOUT (30 * GST_SECOND)
+
 /*---------------------------------------------------------------------------------------
 |    LOCAL FUNCTION PROTOTYPES:                                                                                                                        |
 ---------------------------------------------------------------------------------------*/
@@ -388,7 +390,7 @@ gboolean _mmplayer_start_pd_downloader(MMHandleType handle)
 
        LOGD("set_state :: sret = %d\n", sret);
 
-       sret = gst_element_get_state(pd->downloader_pipeline, &cur_state, &pending_state, GST_CLOCK_TIME_NONE);
+       sret = gst_element_get_state(pd->downloader_pipeline, &cur_state, &pending_state, PD_STATE_CHANGE_TIMEOUT);
        if (GST_STATE_CHANGE_FAILURE == sret) {
                LOGE("PD download pipeline failed to do get_state...");
                return FALSE;
@@ -415,7 +417,7 @@ gboolean _mmplayer_unrealize_pd_downloader(MMHandleType handle)
        MMPLAYER_RETURN_VAL_IF_FAIL(pd && pd->downloader_pipeline, FALSE);
 
        gst_element_set_state(pd->downloader_pipeline, GST_STATE_NULL);
-       gst_element_get_state(pd->downloader_pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
+       gst_element_get_state(pd->downloader_pipeline, NULL, NULL, PD_STATE_CHANGE_TIMEOUT);
 
        gst_object_unref(G_OBJECT(pd->downloader_pipeline));
        pd->downloader_pipeline = NULL;

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index 6ce644b..f6642b2 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -9430,7 +9430,7 @@ _mmplayer_set_runtime_buffering_mode(MMHandleType hplayer, MMPlayerBufferingMode
        return MM_ERROR_NONE;
 }
 
-int
+static int
 __mmplayer_start_streaming_ext(mm_player_t *player)
 {
        gint ret = MM_ERROR_NONE;