From: Eunhye Choi Date: Wed, 29 Jan 2020 09:54:52 +0000 (+0900) Subject: [0.6.215] fix svace issue X-Git-Tag: accepted/tizen/unified/20200204.125823^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba035f34fbda5f01af796cf9b55bc73cce4ed62f;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git [0.6.215] fix svace issue - fix svace issue - set rtsp-sdp prefix to handle sdp file Change-Id: Ib05605544072911af06b7551182ba8394f0e9233 --- diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index c6775d6..bf8cef0 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.214 +Version: 0.6.215 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c index 55adff7..3e82e01 100644 --- a/src/mm_player_attrs.c +++ b/src/mm_player_attrs.c @@ -185,7 +185,7 @@ static media_format_mimetype_e __mmplayer_get_supported_format_mimetype(MMHandle format = MEDIA_FORMAT_PCM_F32LE; else if (!strcmp(name, "PCM_F32BE")) format = MEDIA_FORMAT_PCM_F32BE; - else if (!strcmp(name, "PCM_S16LE")) + else if (!strcmp(name, "PCM_U16LE")) format = MEDIA_FORMAT_PCM_U16LE; else if (!strcmp(name, "PCM_U24LE")) format = MEDIA_FORMAT_PCM_U24LE; diff --git a/src/mm_player_gst.c b/src/mm_player_gst.c index d5c39df..d6f8567 100644 --- a/src/mm_player_gst.c +++ b/src/mm_player_gst.c @@ -243,9 +243,6 @@ __mmplayer_gst_transform_gsterror(mmplayer_t *player, GstMessage *message, GErro player->pipeline->mainbin, MM_ERROR_PLAYER_NOT_INITIALIZED); src_element = GST_ELEMENT_CAST(message->src); - if (!src_element) - return MM_ERROR_PLAYER_INTERNAL; - src_element_name = GST_ELEMENT_NAME(src_element); if (!src_element_name) return MM_ERROR_PLAYER_INTERNAL; diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index e3c2b1d..6e89fba 100644 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -9199,11 +9199,12 @@ __mmplayer_set_file_uri(mmplayer_parse_profile_t *data, const char *uri) /* if no protocol prefix exist. check file existence and then give file:// as it's prefix */ if (ret == MM_ERROR_NONE) { - g_snprintf(data->uri, MM_MAX_URL_LEN, "file://%s", path); if (_mmplayer_is_sdp_file(path)) { LOGD("uri is actually a file but it's sdp file. giving it to rtspsrc"); + g_snprintf(data->uri, MM_MAX_URL_LEN, "rtsp-sdp://%s", path); data->uri_type = MM_PLAYER_URI_TYPE_URL_RTSP; } else { + g_snprintf(data->uri, MM_MAX_URL_LEN, "file://%s", path); data->uri_type = MM_PLAYER_URI_TYPE_FILE; } } else if (ret == MM_ERROR_PLAYER_PERMISSION_DENIED) { diff --git a/src/mm_player_streaming.c b/src/mm_player_streaming.c index 6f5cd28..04e89cc 100644 --- a/src/mm_player_streaming.c +++ b/src/mm_player_streaming.c @@ -281,11 +281,6 @@ static void __streaming_set_queue2_queue_type(mmplayer_streaming_t *streamer, mu buffer_handle = &(streamer->buffer_handle[BUFFER_TYPE_MUXED]); - if (!(buffer_handle && buffer_handle->buffer)) { - LOGE("buffer_handle->buffer is NULL!"); - return; - } - if (type == MUXED_BUFFER_TYPE_MEM_QUEUE) { /* ts */ LOGD("use memory queue for buffering. streaming is played on push-based. \n" "buffering position would not be updated.\n"