[0.6.213] support sdb file input

- set rtsp-sdp prefix to handle sdp file input
- fix svace issue
- cherry-pick : ba035f34fbda5f01af796cf9b55bc73cce4ed62f

Change-Id: I8cca9130260f227c97ccf0a576d1e96747ce3035

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 3fd6892a7118aba7485598c500cc627e7e223623..27b0e4db5f1b0d57f418fa19c6fe77524f54033c 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.212
+Version:    0.6.213
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c
index 55adff7f069b42e80e254847aaa6ce3dc83d8dfa..3e82e01982fb5b7b0218d5ddbca2eb2fbc7bdda2 100644 (file)
--- 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 23ece3a27c0880b985bd7a60029221472a670b28..a1a7edd2c909789b6127be42f68412abba5ec22e 100644 (file)
--- 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 f5cab869d8c38ce708f579945657555ef381cbeb..3f73038bc63372731266cdd4e03913101a9d8cc6 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -9188,11 +9188,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 6f5cd286c8ea465c0c53e1b9051019d022a2a595..04e89cc68997e41cc9bd345dadb3a39a3991d644 100644 (file)
--- 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"