Revert "[0.6.234] Disable ringbuffer in queue2 when streaming mp3"

This reverts commit d5fec5b9bca75865ad9e768db1d1943fcfdf16f4.

Change-Id: Icb369c48a395baf800214a96fd41063c47f93aba

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 5c303a2ac04d061fc9873142bba602f489ab1040..d123de81842fc66ddb7007b93da208be45262d8a 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.240
+Version:    0.6.241
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_player_gst.c b/src/mm_player_gst.c
index 89d50f302864d17c5ca172ac0a61dc302dcde76b..e5e3aa46aba40adea11109b746d25e07642e67b1 100644 (file)
--- a/src/mm_player_gst.c
+++ b/src/mm_player_gst.c
@@ -81,28 +81,6 @@ print_tag(const GstTagList *list, const gchar *tag, gpointer unused)
 }
 #endif
 
-static gboolean
-__mmplayer_is_hls_type(gchar *type) {
-       if (g_strrstr(type, "application/x-hls"))
-               return TRUE;
-       return FALSE;
-}
-
-static gboolean
-__mmplayer_is_mpegts_type(gchar *type) {
-       if (g_strrstr(type, "video/mpegts"))
-               return TRUE;
-       return FALSE;
-}
-
-static gboolean
-__mmplayer_is_mp3_type(gchar *type) {
-       if (g_strrstr(type, "application/x-id3") ||
-               (g_strrstr(type, "audio/mpeg") && g_strrstr(type, "mpegversion=(int)1")))
-               return TRUE;
-       return FALSE;
-}
-
 static gboolean
 __mmplayer_check_error_posted_from_activated_track(mmplayer_t *player, gchar *src_element_name)
 {
@@ -3108,8 +3086,7 @@ __mmplayer_gst_deep_element_added(GstElement *bin, GstBin *child, GstElement *el
                        /* NOTE : in case of ts streaming, player could not get the correct duration info *
                         *                skip the pull mode(file or ring buffering) setting. */
                        if (dur_bytes > 0) {
-                               if (!(__mmplayer_is_mpegts_type(player->type) || __mmplayer_is_hls_type(player->type)
-                                       || __mmplayer_is_mp3_type(player->type))) {
+                               if ((!g_strrstr(player->type, "video/mpegts")) && (!g_strrstr(player->type, "application/x-hls"))) {
                                        type = MUXED_BUFFER_TYPE_MEM_RING_BUFFER;
                                        player->streamer->ring_buffer_size = player->ini.http_ring_buffer_size;
                                }