diff options
| author | Eunhae Choi <eunhae1.choi@samsung.com> | 2016-12-27 20:11:23 +0900 |
|---|---|---|
| committer | eunhae choi <eunhae1.choi@samsung.com> | 2016-12-27 03:18:03 -0800 |
| commit | dcceeeb737c89104e59dc45c36bd1450b3df823b (patch) | |
| tree | 931031270ebf98fe76760cd135f8da4fea644c0a | |
| parent | 405c56b1296f1554c3baec29cfe9469418238d06 (diff) | |
| download | libmm-player-dcceeeb737c89104e59dc45c36bd1450b3df823b.tar.gz libmm-player-dcceeeb737c89104e59dc45c36bd1450b3df823b.tar.bz2 libmm-player-dcceeeb737c89104e59dc45c36bd1450b3df823b.zip | |
[v0.6.20] fix bug, release cmd lock in exception casesubmit/tizen/20161227.144440accepted/tizen/wearable/20161228.083652accepted/tizen/tv/20161228.083641accepted/tizen/mobile/20161228.083621accepted/tizen/ivi/20161228.083716accepted/tizen/common/20161227.192702
Change-Id: I595e81467eb2d460aaae098811bfaa99a48056a7
(cherry picked from commit b7bf7e96a66f9fe831819bc4b51c3cc11455b6b4)
| -rw-r--r-- | packaging/libmm-player.spec | 2 | ||||
| -rw-r--r-- | src/mm_player_priv.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index a3bcdb7..d2d2c92 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.19 +Version: 0.6.20 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index 4bb2f58..44e3086 100644 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -849,6 +849,7 @@ static gpointer __mmplayer_repeat_thread(gpointer data) if (mm_attrs_get_int_by_name(attrs, "profile_play_count", &count) != MM_ERROR_NONE) { LOGE("can not get play count\n"); + MMPLAYER_CMD_UNLOCK(player); break; } @@ -871,6 +872,7 @@ static gpointer __mmplayer_repeat_thread(gpointer data) if (!ret_value) { LOGE("failed to set position to zero for rewind\n"); + MMPLAYER_CMD_UNLOCK(player); continue; } @@ -1322,6 +1324,7 @@ __mmplayer_gst_callback(GstBus *bus, GstMessage *msg, gpointer data) // @ } else if (bRet == MM_ERROR_PLAYER_INVALID_STATE) { if (!player->streamer) { LOGW("player->streamer is NULL, so discarding the buffering percent update\n"); + MMPLAYER_CMD_UNLOCK(player); break; } @@ -8158,8 +8161,9 @@ static int __mmfplayer_parse_profile(const char *uri, void *param, MMPlayerParse if (util_is_sdp_file(path)) { LOGD("uri is actually a file but it's sdp file. giving it to rtspsrc\n"); data->uri_type = MM_PLAYER_URI_TYPE_URL_RTSP; - } else + } else { data->uri_type = MM_PLAYER_URI_TYPE_FILE; + } ret = MM_ERROR_NONE; } else if (file_stat == MM_ERROR_PLAYER_PERMISSION_DENIED) { data->uri_type = MM_PLAYER_URI_TYPE_NO_PERMISSION; |