diff options
| author | Eunhae Choi <eunhae1.choi@samsung.com> | 2017-03-29 15:19:28 +0900 |
|---|---|---|
| committer | Eunhae Choi <eunhae1.choi@samsung.com> | 2017-03-29 15:19:32 +0900 |
| commit | a939fd93a89c19d7ad8be05671926dc353066d6b (patch) | |
| tree | dede1f6bfd6f3fcd1b6164bfe8156a5b685ab1dc | |
| parent | 4a413bb2078f7ec666f8dcb15e2bf363f29cf9c8 (diff) | |
| download | libmm-player-a939fd93a89c19d7ad8be05671926dc353066d6b.tar.gz libmm-player-a939fd93a89c19d7ad8be05671926dc353066d6b.tar.bz2 libmm-player-a939fd93a89c19d7ad8be05671926dc353066d6b.zip | |
[0.6.39] add pd state change timeoutsubmit/tizen_3.0/20170329.075800accepted/tizen/3.0/wearable/20170330.092027accepted/tizen/3.0/tv/20170330.091958accepted/tizen/3.0/mobile/20170330.091909accepted/tizen/3.0/ivi/20170330.092059accepted/tizen/3.0/common/20170330.125226
if the network is disconnected, it will wait infinitely.
Change-Id: I7f4dc985626be18490ddf3dacf90a4f67f3841ce
| -rw-r--r-- | packaging/libmm-player.spec | 2 | ||||
| -rw-r--r-- | src/mm_player_pd.c | 6 | ||||
| -rw-r--r-- | src/mm_player_priv.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index 84e9fb2..74ba6e8 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.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 --- 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 --- 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; |