Merge branch 'tizen' into tizen_5.5_devel
[platform/core/multimedia/libmm-player.git] / src / mm_player_gst.c
index 285c6df..de2a740 100644 (file)
 |  FUNCTION DEFINITIONS                                                                                                                                                |
 |                                                                                                                                                                                      |
 ========================================================================================== */
+#ifdef __DEBUG__
+static void
+print_tag(const GstTagList *list, const gchar *tag, gpointer unused)
+{
+       gint i, count;
+
+       count = gst_tag_list_get_tag_size(list, tag);
+
+       LOGD("count = %d", count);
+
+       for (i = 0; i < count; i++) {
+               gchar *str;
+
+               if (gst_tag_get_type(tag) == G_TYPE_STRING) {
+                       if (!gst_tag_list_get_string_index(list, tag, i, &str))
+                               g_assert_not_reached();
+               } else {
+                       str = g_strdup_value_contents(gst_tag_list_get_value_index(list, tag, i));
+               }
+
+               if (i == 0)
+                       g_print("  %15s: %s", gst_tag_get_nick(tag), str);
+               else
+                       g_print("                 : %s", str);
+
+               g_free(str);
+       }
+}
+#endif
 
 static gboolean
-__mmplayer_check_error_posted_from_activated_track(mm_player_t *player, gchar *src_element_name)
+__mmplayer_check_error_posted_from_activated_track(mmplayer_t *player, gchar *src_element_name)
 {
        /* check whether the error is posted from not-activated track or not */
        int msg_src_pos = 0;
@@ -123,7 +152,7 @@ __mmplayer_check_error_posted_from_activated_track(mm_player_t *player, gchar *s
 }
 
 static int
-__mmplayer_gst_transform_error_decode(mm_player_t *player, const char *klass)
+__mmplayer_gst_transform_error_decode(mmplayer_t *player, const char *klass)
 {
        /* Demuxer can't parse one track because it's corrupted.
         * So, the decoder for it is not linked.
@@ -148,7 +177,7 @@ __mmplayer_gst_transform_error_decode(mm_player_t *player, const char *klass)
 }
 
 static int
-__mmplayer_gst_transform_error_type(mm_player_t *player, GstElement *src_element)
+__mmplayer_gst_transform_error_type(mmplayer_t *player, GstElement *src_element)
 {
        if (src_element == player->pipeline->mainbin[MMPLAYER_M_SUBPARSE].gst) {
                LOGE("Not supported subtitle.");
@@ -158,7 +187,7 @@ __mmplayer_gst_transform_error_type(mm_player_t *player, GstElement *src_element
 }
 
 static int
-__mmplayer_gst_transform_error_failed(mm_player_t *player, const char *klass, GError *error)
+__mmplayer_gst_transform_error_failed(mmplayer_t *player, const char *klass, GError *error)
 {
        /* Decoder Custom Message */
        if (!strstr(error->message, "ongoing"))
@@ -181,7 +210,7 @@ __mmplayer_gst_transform_error_failed(mm_player_t *player, const char *klass, GE
 }
 
 static int
-__mmplayer_gst_transform_error_decrypt(mm_player_t *player, GError *error)
+__mmplayer_gst_transform_error_decrypt(mmplayer_t *player, GError *error)
 {
        if (strstr(error->message, "rights expired"))
                return MM_ERROR_PLAYER_DRM_EXPIRED;
@@ -197,7 +226,7 @@ __mmplayer_gst_transform_error_decrypt(mm_player_t *player, GError *error)
 
 /* NOTE : decide gstreamer state whether there is some playable track or not. */
 static gint
-__mmplayer_gst_transform_gsterror(mm_player_t *player, GstMessage *message, GError *error)
+__mmplayer_gst_transform_gsterror(mmplayer_t *player, GstMessage *message, GError *error)
 {
        gchar *src_element_name = NULL;
        GstElement *src_element = NULL;
@@ -214,9 +243,6 @@ __mmplayer_gst_transform_gsterror(mm_player_t *player, GstMessage *message, GErr
                                                                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;
@@ -258,7 +284,7 @@ __mmplayer_gst_transform_gsterror(mm_player_t *player, GstMessage *message, GErr
 }
 
 gint
-__mmplayer_gst_handle_core_error(mm_player_t *player, int code)
+__mmplayer_gst_handle_core_error(mmplayer_t *player, int code)
 {
        gint trans_err = MM_ERROR_NONE;
 
@@ -293,7 +319,7 @@ __mmplayer_gst_handle_core_error(mm_player_t *player, int code)
 }
 
 gint
-__mmplayer_gst_handle_library_error(mm_player_t *player, int code)
+__mmplayer_gst_handle_library_error(mmplayer_t *player, int code)
 {
        gint trans_err = MM_ERROR_NONE;
 
@@ -319,7 +345,7 @@ __mmplayer_gst_handle_library_error(mm_player_t *player, int code)
 }
 
 gint
-__mmplayer_gst_handle_resource_error(mm_player_t *player, int code, GstMessage *message)
+__mmplayer_gst_handle_resource_error(mmplayer_t *player, int code, GstMessage *message)
 {
        gint trans_err = MM_ERROR_NONE;
 
@@ -345,7 +371,7 @@ __mmplayer_gst_handle_resource_error(mm_player_t *player, int code, GstMessage *
                        break;
                } else if (message != NULL && message->src != NULL) {
                        storage_state_e storage_state = STORAGE_STATE_UNMOUNTABLE;
-                       MMPlayerPathType path_type = MMPLAYER_PATH_MAX;
+                       mmplayer_path_type_e path_type = MMPLAYER_PATH_MAX;
 
                        if (message->src == (GstObject *)player->pipeline->mainbin[MMPLAYER_M_SRC].gst)
                                path_type = MMPLAYER_PATH_VOD;
@@ -380,7 +406,7 @@ __mmplayer_gst_handle_resource_error(mm_player_t *player, int code, GstMessage *
 }
 
 gint
-__mmplayer_gst_handle_stream_error(mm_player_t *player, GError *error, GstMessage *message)
+__mmplayer_gst_handle_stream_error(mmplayer_t *player, GError *error, GstMessage *message)
 {
        gint trans_err = MM_ERROR_NONE;
 
@@ -418,7 +444,7 @@ __mmplayer_gst_handle_stream_error(mm_player_t *player, GError *error, GstMessag
 }
 
 gboolean
-__mmplayer_handle_gst_error(mm_player_t *player, GstMessage *message, GError *error)
+__mmplayer_handle_gst_error(mmplayer_t *player, GstMessage *message, GError *error)
 {
        MMMessageParamType msg_param;
        gchar *msg_src_element;
@@ -488,7 +514,7 @@ __mmplayer_handle_gst_error(mm_player_t *player, GstMessage *message, GError *er
 }
 
 static gboolean
-__mmplayer_handle_streaming_error(mm_player_t *player, GstMessage *message)
+__mmplayer_handle_streaming_error(mmplayer_t *player, GstMessage *message)
 {
        LOGD("\n");
        MMMessageParamType msg_param;
@@ -658,7 +684,7 @@ __mmplayer_handle_streaming_error(mm_player_t *player, GstMessage *message)
        if (message->src) {
                msg_src_element = GST_ELEMENT_NAME(GST_ELEMENT_CAST(message->src));
 
-               LOGE("-Msg src : [%s] Code : [%x] Error : [%s]",
+               LOGE("-Msg src : [%s] Code : [0x%x] Error : [%s]",
                        msg_src_element, msg_param.code, (char *)msg_param.data);
        }
 
@@ -681,7 +707,7 @@ __mmplayer_handle_streaming_error(mm_player_t *player, GstMessage *message)
 }
 
 static void
-__mmplayer_get_metadata_360_from_tags(GstTagList *tags, mm_player_spherical_metadata_t *metadata)
+__mmplayer_get_metadata_360_from_tags(GstTagList *tags, mmplayer_spherical_metadata_t *metadata)
 {
        gst_tag_list_get_int(tags, "is_spherical", &metadata->is_spherical);
        gst_tag_list_get_int(tags, "is_stitched", &metadata->is_stitched);
@@ -713,11 +739,11 @@ __mmplayer_get_metadata_360_from_tags(GstTagList *tags, mm_player_spherical_meta
 }
 
 static gboolean
-__mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_extract_tag_from_msg(mmplayer_t *player, GstMessage *msg)
 {
 
 /* macro for better code readability */
-#define MMPLAYER_UPDATE_TAG_STRING(gsttag, attribute, playertag) \
+#define MMPLAYER_UPDATE_TAG_STRING(gsttag, player, playertag) \
        do { \
                if (gst_tag_list_get_string(tag_list, gsttag, &string)) {\
                        if (string != NULL) { \
@@ -726,17 +752,19 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
                                        char *new_string = g_malloc(MM_MAX_STRING_LENGTH); \
                                        strncpy(new_string, string, MM_MAX_STRING_LENGTH - 1); \
                                        new_string[MM_MAX_STRING_LENGTH - 1] = '\0'; \
-                                       mm_attrs_set_string_by_name(attribute, playertag, new_string); \
+                                       mm_player_set_attribute((MMHandleType)player, NULL,\
+                                                       playertag, new_string, strlen(new_string), NULL); \
                                        MMPLAYER_FREEIF(new_string); \
                                } else { \
-                                       mm_attrs_set_string_by_name(attribute, playertag, string); \
+                                       mm_player_set_attribute((MMHandleType)player, NULL,\
+                                                       playertag, string, strlen(string), NULL); \
                                } \
                                MMPLAYER_FREEIF(string); \
                        } \
                } \
        } while (0)
 
-#define MMPLAYER_UPDATE_TAG_IMAGE(gsttag, attribute, playertag) \
+#define MMPLAYER_UPDATE_TAG_IMAGE(gsttag, player, playertag) \
        do {    \
                GstSample *sample = NULL;\
                if (gst_tag_list_get_sample_index(tag_list, gsttag, index, &sample)) {\
@@ -752,7 +780,8 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
                        player->album_art = (gchar *)g_malloc(info.size);\
                        if (player->album_art) {\
                                memcpy(player->album_art, info.data, info.size);\
-                               mm_attrs_set_data_by_name(attribute, playertag, (void *)player->album_art, info.size);\
+                               mm_player_set_attribute((MMHandleType)player, NULL,\
+                                               playertag, (void *)player->album_art, info.size, NULL); \
                                if (MMPLAYER_IS_HTTP_LIVE_STREAMING(player)) {\
                                        msg_param.data = (void *)player->album_art;\
                                        msg_param.size = info.size;\
@@ -765,12 +794,12 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
                }       \
        } while (0)
 
-#define MMPLAYER_UPDATE_TAG_UINT(gsttag, attribute, playertag) \
+#define MMPLAYER_UPDATE_TAG_UINT(gsttag, player, playertag) \
        do {    \
                if (gst_tag_list_get_uint(tag_list, gsttag, &v_uint)) { \
                        if (v_uint) { \
                                int i = 0; \
-                               MMPlayerTrackType track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \
+                               mmplayer_track_type_e track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \
                                if (strstr(GST_OBJECT_NAME(msg->src), "audio")) \
                                        track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \
                                else if (strstr(GST_OBJECT_NAME(msg->src), "video")) \
@@ -779,34 +808,38 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
                                        track_type = MM_PLAYER_TRACK_TYPE_TEXT; \
                                if (!strncmp(gsttag, GST_TAG_BITRATE, strlen(GST_TAG_BITRATE))) { \
                                        if (track_type == MM_PLAYER_TRACK_TYPE_AUDIO) \
-                                               mm_attrs_set_int_by_name(attribute, "content_audio_bitrate", v_uint); \
+                                               mm_player_set_attribute((MMHandleType)player, NULL,\
+                                                               "content_audio_bitrate", v_uint, NULL); \
                                        player->bitrate[track_type] = v_uint; \
                                        player->total_bitrate = 0; \
                                        for (i = 0; i < MM_PLAYER_STREAM_COUNT_MAX; i++) \
                                                player->total_bitrate += player->bitrate[i]; \
-                                       mm_attrs_set_int_by_name(attribute, playertag, player->total_bitrate); \
+                                       mm_player_set_attribute((MMHandleType)player, NULL,\
+                                                       playertag, player->total_bitrate, NULL); \
                                        SECURE_LOGD("update bitrate %d[bps] of stream #%d.", v_uint, (int)track_type); \
                                } else if (!strncmp(gsttag, GST_TAG_MAXIMUM_BITRATE, strlen(GST_TAG_MAXIMUM_BITRATE))) { \
                                        player->maximum_bitrate[track_type] = v_uint; \
                                        player->total_maximum_bitrate = 0; \
                                        for (i = 0; i < MM_PLAYER_STREAM_COUNT_MAX; i++) \
                                                player->total_maximum_bitrate += player->maximum_bitrate[i]; \
-                                       mm_attrs_set_int_by_name(attribute, playertag, player->total_maximum_bitrate);\
+                                       mm_player_set_attribute((MMHandleType)player, NULL,\
+                                                       playertag, player->total_maximum_bitrate, NULL); \
                                        SECURE_LOGD("update maximum bitrate %d[bps] of stream #%d", v_uint, (int)track_type);\
                                } else { \
-                                       mm_attrs_set_int_by_name(attribute, playertag, v_uint); \
+                                       mm_player_set_attribute((MMHandleType)player, NULL, playertag, v_uint, NULL); \
                                } \
                                v_uint = 0;\
                        } \
                } \
        } while (0)
 
-#define MMPLAYER_UPDATE_TAG_DATE(gsttag, attribute, playertag) \
+#define MMPLAYER_UPDATE_TAG_DATE(gsttag, player, playertag) \
        do { \
                if (gst_tag_list_get_date(tag_list, gsttag, &date)) {\
                        if (date != NULL) {\
                                string = g_strdup_printf("%d", g_date_get_year(date));\
-                               mm_attrs_set_string_by_name(attribute, playertag, string);\
+                               mm_player_set_attribute((MMHandleType)player, NULL,\
+                                               playertag, string, strlen(string), NULL); \
                                SECURE_LOGD("metainfo year : %s", string);\
                                MMPLAYER_FREEIF(string);\
                                g_date_free(date);\
@@ -814,12 +847,13 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
                } \
        } while (0)
 
-#define MMPLAYER_UPDATE_TAG_DATE_TIME(gsttag, attribute, playertag) \
+#define MMPLAYER_UPDATE_TAG_DATE_TIME(gsttag, player, playertag) \
        do { \
                if (gst_tag_list_get_date_time(tag_list, gsttag, &datetime)) {\
                        if (datetime != NULL) {\
                                string = g_strdup_printf("%d", gst_date_time_get_year(datetime));\
-                               mm_attrs_set_string_by_name(attribute, playertag, string);\
+                               mm_player_set_attribute((MMHandleType)player, NULL,\
+                                               playertag, string, strlen(string), NULL); \
                                SECURE_LOGD("metainfo year : %s", string);\
                                MMPLAYER_FREEIF(string);\
                                gst_date_time_unref(datetime);\
@@ -827,33 +861,9 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
                } \
        } while (0)
 
-#define MMPLAYER_UPDATE_TAG_UINT64(gsttag, attribute, playertag) \
-       do { \
-               if (gst_tag_list_get_uint64(tag_list, gsttag, &v_uint64)) {\
-                       if (v_uint64) {\
-                               /* FIXIT : don't know how to store date */\
-                               g_assert(1);\
-                               v_uint64 = 0;\
-                       } \
-               } \
-       } while (0)
-
-#define MMPLAYER_UPDATE_TAG_DOUBLE(gsttag, attribute, playertag) \
-       do { \
-               if (gst_tag_list_get_double(tag_list, gsttag, &v_double)) {\
-                       if (v_double) {\
-                               /* FIXIT : don't know how to store date */\
-                               g_assert(1);\
-                               v_double = 0;\
-                       } \
-               } \
-       } while (0)
-
        /* function start */
        GstTagList *tag_list = NULL;
 
-       MMHandleType attrs = 0;
-
        char *string = NULL;
        guint v_uint = 0;
        GDate *date = NULL;
@@ -869,69 +879,34 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
 
        MMPLAYER_RETURN_VAL_IF_FAIL(player && msg, FALSE);
 
-       attrs = MMPLAYER_GET_ATTRS(player);
-
-       MMPLAYER_RETURN_VAL_IF_FAIL(attrs, FALSE);
-
        /* get tag list from gst message */
        gst_message_parse_tag(msg, &tag_list);
 
        /* store tags to player attributes */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_TITLE, attrs, "tag_title");
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_TITLE_SORTNAME, ?, ?); */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ARTIST, attrs, "tag_artist");
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ARTIST_SORTNAME, ?, ?); */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ALBUM, attrs, "tag_album");
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ALBUM_SORTNAME, ?, ?); */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_COMPOSER, attrs, "tag_author");
-       MMPLAYER_UPDATE_TAG_DATE(GST_TAG_DATE, attrs, "tag_date");
-       MMPLAYER_UPDATE_TAG_DATE_TIME(GST_TAG_DATE_TIME, attrs, "tag_date");
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_GENRE, attrs, "tag_genre");
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_COMMENT, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_EXTENDED_COMMENT, ?, ?); */
-       MMPLAYER_UPDATE_TAG_UINT(GST_TAG_TRACK_NUMBER, attrs, "tag_track_num");
-       /* MMPLAYER_UPDATE_TAG_UINT(GST_TAG_TRACK_COUNT, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_UINT(GST_TAG_ALBUM_VOLUME_NUMBER, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_UINT(GST_TAG_ALBUM_VOLUME_COUNT, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_LOCATION, ?, ?); */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_DESCRIPTION, attrs, "tag_description");
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_VERSION, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ISRC, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ORGANIZATION, ?, ?); */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_COPYRIGHT, attrs, "tag_copyright");
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_COPYRIGHT_URI, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_CONTACT, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_LICENSE, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_LICENSE_URI, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_PERFORMER, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_UINT64(GST_TAG_DURATION, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_CODEC, ?, ?); */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_VIDEO_CODEC, attrs, "content_video_codec");
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_AUDIO_CODEC, attrs, "content_audio_codec");
-       MMPLAYER_UPDATE_TAG_UINT(GST_TAG_BITRATE, attrs, "content_bitrate");
-       MMPLAYER_UPDATE_TAG_UINT(GST_TAG_MAXIMUM_BITRATE, attrs, "content_max_bitrate");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_TITLE, player, "tag_title");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ARTIST, player, "tag_artist");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ALBUM, player, "tag_album");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_COMPOSER, player, "tag_author");
+       MMPLAYER_UPDATE_TAG_DATE(GST_TAG_DATE, player, "tag_date");
+       MMPLAYER_UPDATE_TAG_DATE_TIME(GST_TAG_DATE_TIME, player, "tag_date");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_GENRE, player, "tag_genre");
+       MMPLAYER_UPDATE_TAG_UINT(GST_TAG_TRACK_NUMBER, player, "tag_track_num");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_DESCRIPTION, player, "tag_description");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_COPYRIGHT, player, "tag_copyright");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_VIDEO_CODEC, player, "content_video_codec");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_AUDIO_CODEC, player, "content_audio_codec");
+       MMPLAYER_UPDATE_TAG_UINT(GST_TAG_BITRATE, player, "content_bitrate");
+       MMPLAYER_UPDATE_TAG_UINT(GST_TAG_MAXIMUM_BITRATE, player, "content_max_bitrate");
        MMPLAYER_UPDATE_TAG_LOCK(player);
-       MMPLAYER_UPDATE_TAG_IMAGE(GST_TAG_IMAGE, attrs, "tag_album_cover");
+       MMPLAYER_UPDATE_TAG_IMAGE(GST_TAG_IMAGE, player, "tag_album_cover");
        MMPLAYER_UPDATE_TAG_UNLOCK(player);
-       /* MMPLAYER_UPDATE_TAG_UINT(GST_TAG_NOMINAL_BITRATE, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_UINT(GST_TAG_MINIMUM_BITRATE, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_UINT(GST_TAG_SERIAL, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_ENCODER, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_UINT(GST_TAG_ENCODER_VERSION, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_DOUBLE(GST_TAG_TRACK_GAIN, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_DOUBLE(GST_TAG_TRACK_PEAK, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_DOUBLE(GST_TAG_ALBUM_GAIN, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_DOUBLE(GST_TAG_ALBUM_PEAK, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_DOUBLE(GST_TAG_REFERENCE_LEVEL, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_STRING(GST_TAG_LANGUAGE_CODE, ?, ?); */
-       /* MMPLAYER_UPDATE_TAG_DOUBLE(GST_TAG_BEATS_PER_MINUTE, ?, ?); */
-       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_IMAGE_ORIENTATION, attrs, "content_video_orientation");
+       MMPLAYER_UPDATE_TAG_STRING(GST_TAG_IMAGE_ORIENTATION, player, "content_video_orientation");
 
        if (strstr(GST_OBJECT_NAME(msg->src), "demux")) {
                if (player->video360_metadata.is_spherical == -1) {
                        __mmplayer_get_metadata_360_from_tags(tag_list, &player->video360_metadata);
-                       mm_attrs_set_int_by_name(attrs, "content_video_is_spherical",
-                                       player->video360_metadata.is_spherical);
+                       mm_player_set_attribute((MMHandleType)player, NULL,
+                                       "content_video_is_spherical", player->video360_metadata.is_spherical, NULL);
                        if (player->video360_metadata.is_spherical == 1) {
                                LOGD("This is spherical content for 360 playback.");
                                player->is_content_spherical = TRUE;
@@ -964,9 +939,6 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
                }
        }
 
-       if (mm_attrs_commit_all(attrs))
-               LOGE("failed to commit.");
-
        gst_tag_list_unref(tag_list);
 
        return TRUE;
@@ -974,7 +946,7 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg)
 
 /* if retval is FALSE, it will be dropped for perfomance. */
 static gboolean
-__mmplayer_gst_check_useful_message(mm_player_t *player, GstMessage *message)
+__mmplayer_gst_check_useful_message(mmplayer_t *player, GstMessage *message)
 {
        gboolean retval = FALSE;
 
@@ -993,6 +965,7 @@ __mmplayer_gst_check_useful_message(mm_player_t *player, GstMessage *message)
        case GST_MESSAGE_ELEMENT:
        case GST_MESSAGE_DURATION_CHANGED:
        case GST_MESSAGE_ASYNC_START:
+       case GST_MESSAGE_STREAM_COLLECTION:
                retval = TRUE;
                break;
        case GST_MESSAGE_ASYNC_DONE:
@@ -1028,6 +1001,35 @@ __mmplayer_gst_check_useful_message(mm_player_t *player, GstMessage *message)
 
                break;
        }
+       case GST_MESSAGE_STREAMS_SELECTED:
+       {
+               if (!MMPLAYER_USE_URIDECODEBIN3(player))
+                       break; /* drop msg */
+
+               if ((MMPLAYER_IS_HTTP_STREAMING(player)) &&
+                       (!player->pipeline->mainbin[MMPLAYER_M_DEMUXED_S_BUFFER].gst) &&
+                       (player->pipeline->mainbin[MMPLAYER_M_MUXED_S_BUFFER].gst)) {
+
+                       gint64 dur_bytes = 0L;
+
+                       if (!gst_element_query_duration(player->pipeline->mainbin[MMPLAYER_M_SRC].gst, GST_FORMAT_BYTES, &dur_bytes))
+                               LOGE("fail to get duration.");
+
+                       /* there is no mq, enable use-buffering on queue2 (ex) wav streaming
+                        * use file information was already set on Q2 when it was created. */
+                       _mm_player_streaming_set_queue2(player->streamer,
+                                                       player->pipeline->mainbin[MMPLAYER_M_MUXED_S_BUFFER].gst,
+                                                       TRUE,                                                           /* use_buffering */
+                                                       MUXED_BUFFER_TYPE_MAX,                          /* use previous buffer type setting */
+                                                       ((dur_bytes > 0) ? ((guint64)dur_bytes) : 0));
+               }
+
+               LOGD("GST_MESSAGE_STREAMS_SELECTED");
+               player->no_more_pad = TRUE;
+               _mmplayer_pipeline_complete(NULL, player);
+               retval = TRUE;
+               break;
+       }
        default:
                retval = FALSE;
                break;
@@ -1037,33 +1039,33 @@ __mmplayer_gst_check_useful_message(mm_player_t *player, GstMessage *message)
 }
 
 static void
-__mmplayer_update_buffer_setting(mm_player_t *player, GstMessage *buffering_msg)
+__mmplayer_update_buffer_setting(mmplayer_t *player, GstMessage *buffering_msg)
 {
        guint64 data_size = 0;
        gint64 pos_nsec = 0;
 
        MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->mainbin);
 
-       __mmplayer_gst_get_position(player, &pos_nsec); /* to update player->last_position */
+       _mmplayer_gst_get_position(player, &pos_nsec);  /* to update player->last_position */
 
        if (MMPLAYER_IS_HTTP_STREAMING(player)) {
                data_size = player->http_content_size;
        }
 
-       __mm_player_streaming_buffering(player->streamer, buffering_msg, data_size, player->last_position, player->duration);
-       __mm_player_streaming_sync_property(player->streamer, player->pipeline->mainbin[MMPLAYER_M_AUTOPLUG].gst);
+       _mm_player_streaming_buffering(player->streamer, buffering_msg, data_size, player->last_position, player->duration);
+       _mm_player_streaming_sync_property(player->streamer, player->pipeline->mainbin[MMPLAYER_M_AUTOPLUG].gst);
 
        return;
 }
 
 static int
-__mmplayer_handle_buffering_playback(mm_player_t *player)
+__mmplayer_handle_buffering_playback(mmplayer_t *player)
 {
        int ret = MM_ERROR_NONE;
-       MMPlayerStateType prev_state = MM_PLAYER_STATE_NONE;
-       MMPlayerStateType current_state = MM_PLAYER_STATE_NONE;
-       MMPlayerStateType target_state = MM_PLAYER_STATE_NONE;
-       MMPlayerStateType pending_state = MM_PLAYER_STATE_NONE;
+       mmplayer_state_e prev_state = MM_PLAYER_STATE_NONE;
+       mmplayer_state_e current_state = MM_PLAYER_STATE_NONE;
+       mmplayer_state_e target_state = MM_PLAYER_STATE_NONE;
+       mmplayer_state_e pending_state = MM_PLAYER_STATE_NONE;
 
        if (!player || !player->streamer || (MMPLAYER_IS_LIVE_STREAMING(player) && MMPLAYER_IS_RTSP_STREAMING(player))) {
                LOGW("do nothing for buffering msg");
@@ -1090,7 +1092,7 @@ __mmplayer_handle_buffering_playback(mm_player_t *player)
                        {
                                switch (pending_state) {
                                case MM_PLAYER_STATE_PLAYING:
-                                       __mmplayer_gst_pause(player, TRUE);
+                                       _mmplayer_gst_pause(player, TRUE);
                                        break;
 
                                case MM_PLAYER_STATE_PAUSED:
@@ -1113,7 +1115,7 @@ __mmplayer_handle_buffering_playback(mm_player_t *player)
                                case MM_PLAYER_STATE_NONE:
                                        {
                                                if (current_state != MM_PLAYER_STATE_PLAYING)
-                                                       __mmplayer_gst_resume(player, TRUE);
+                                                       _mmplayer_gst_resume(player, TRUE);
                                        }
                                        break;
 
@@ -1122,12 +1124,12 @@ __mmplayer_handle_buffering_playback(mm_player_t *player)
                                         * Because, buffering can be completed during autoplugging when pipeline would try to go playing state directly.
                                         */
                                        if (current_state == MM_PLAYER_STATE_PLAYING) {
-                                               /* NOTE: If the current state is PLAYING, it means, async __mmplayer_gst_pause() is not completed yet.
+                                               /* NOTE: If the current state is PLAYING, it means, async _mmplayer_gst_pause() is not completed yet.
                                                 * The current state should be changed to paused purposely to prevent state conflict.
                                                 */
                                                MMPLAYER_SET_STATE(player, MM_PLAYER_STATE_PAUSED);
                                        }
-                                       __mmplayer_gst_resume(player, TRUE);
+                                       _mmplayer_gst_resume(player, TRUE);
                                        break;
 
                                case MM_PLAYER_STATE_PLAYING:
@@ -1161,7 +1163,7 @@ __mmplayer_handle_buffering_playback(mm_player_t *player)
                                        /* rtsp streaming pause makes rtsp server stop sending data. */
                                        if (!MMPLAYER_IS_RTSP_STREAMING(player)) {
                                                LOGD("set pause state during buffering");
-                                               __mmplayer_gst_pause(player, TRUE);
+                                               _mmplayer_gst_pause(player, TRUE);
                                        }
                                }
                        }
@@ -1170,7 +1172,7 @@ __mmplayer_handle_buffering_playback(mm_player_t *player)
                case MM_PLAYER_STATE_PLAYING:
                        /* rtsp streaming pause makes rtsp server stop sending data. */
                        if (!MMPLAYER_IS_RTSP_STREAMING(player))
-                               __mmplayer_gst_pause(player, TRUE);
+                               _mmplayer_gst_pause(player, TRUE);
                        break;
 
                case MM_PLAYER_STATE_PAUSED:
@@ -1188,13 +1190,13 @@ exit:
        return ret;
 }
 
-static VariantData *
-__mmplayer_adaptive_var_info(const VariantData *self, gpointer user_data)
+static stream_variant_t *
+__mmplayer_adaptive_var_info(const stream_variant_t *self, gpointer user_data)
 {
-       VariantData *var_info = NULL;
+       stream_variant_t *var_info = NULL;
        g_return_val_if_fail(self != NULL, NULL);
 
-       var_info = g_new0(VariantData, 1);
+       var_info = g_new0(stream_variant_t, 1);
        if (!var_info) return NULL;
        var_info->bandwidth = self->bandwidth;
        var_info->width = self->width;
@@ -1203,7 +1205,7 @@ __mmplayer_adaptive_var_info(const VariantData *self, gpointer user_data)
 }
 
 static gboolean
-__mmplayer_gst_handle_duration(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_handle_duration(mmplayer_t *player, GstMessage *msg)
 {
        gint64 bytes = 0;
 
@@ -1222,7 +1224,7 @@ __mmplayer_gst_handle_duration(mm_player_t *player, GstMessage *msg)
                }
        } else {
                /* handling audio clip which has vbr. means duration is keep changing */
-               __mmplayer_update_content_attrs(player, ATTR_DURATION);
+               _mmplayer_update_content_attrs(player, ATTR_DURATION);
        }
 
        MMPLAYER_FLEAVE();
@@ -1233,20 +1235,20 @@ __mmplayer_gst_handle_duration(mm_player_t *player, GstMessage *msg)
 static gboolean
 __mmplayer_eos_timer_cb(gpointer u_data)
 {
-       mm_player_t *player = NULL;
+       mmplayer_t *player = NULL;
        MMHandleType attrs = 0;
        int count = 0;
 
        MMPLAYER_RETURN_VAL_IF_FAIL(u_data, FALSE);
 
-       player = (mm_player_t *)u_data;
+       player = (mmplayer_t *)u_data;
        attrs = MMPLAYER_GET_ATTRS(player);
 
        mm_attrs_get_int_by_name(attrs, "profile_play_count", &count);
 
        if (count == -1) {
                gint ret_value = 0;
-               ret_value = __mmplayer_gst_set_position(player, 0, TRUE);
+               ret_value = _mmplayer_gst_set_position(player, 0, TRUE);
                if (ret_value != MM_ERROR_NONE)
                        LOGE("seeking to 0 failed in repeat play");
        } else {
@@ -1259,23 +1261,23 @@ __mmplayer_eos_timer_cb(gpointer u_data)
 }
 
 static void
-__mmplayer_handle_eos_delay(mm_player_t *player, int delay_in_ms)
+__mmplayer_handle_eos_delay(mmplayer_t *player, int delay_in_ms)
 {
        MMPLAYER_RETURN_IF_FAIL(player);
 
        /* post now if delay is zero */
-       if (delay_in_ms == 0 || player->audio_stream_render_cb) {
+       if (delay_in_ms == 0 || player->audio_decoded_cb) {
                LOGD("eos delay is zero. posting EOS now");
                MMPLAYER_POST_MSG(player, MM_MESSAGE_END_OF_STREAM, NULL);
 
-               if (player->audio_stream_render_cb)
-                       __mmplayer_cancel_eos_timer(player);
+               if (player->audio_decoded_cb)
+                       _mmplayer_cancel_eos_timer(player);
 
                return;
        }
 
        /* cancel if existing */
-       __mmplayer_cancel_eos_timer(player);
+       _mmplayer_cancel_eos_timer(player);
 
        /* init new timeout */
        /* NOTE : consider give high priority to this timer */
@@ -1295,9 +1297,9 @@ __mmplayer_handle_eos_delay(mm_player_t *player, int delay_in_ms)
 }
 
 static int
-__mmplayer_gst_pending_seek(mm_player_t *player)
+__mmplayer_gst_pending_seek(mmplayer_t *player)
 {
-       MMPlayerStateType current_state = MM_PLAYER_STATE_NONE;
+       mmplayer_state_e current_state = MM_PLAYER_STATE_NONE;
        int ret = MM_ERROR_NONE;
 
        MMPLAYER_FENTER();
@@ -1320,7 +1322,7 @@ __mmplayer_gst_pending_seek(mm_player_t *player)
 
        LOGD("trying to play from(%"G_GINT64_FORMAT") pending position", player->pending_seek.pos);
 
-       ret = __mmplayer_gst_set_position(player, player->pending_seek.pos, FALSE);
+       ret = _mmplayer_gst_set_position(player, player->pending_seek.pos, FALSE);
        if (ret != MM_ERROR_NONE)
                LOGE("failed to seek pending postion. just keep staying current position.");
 
@@ -1332,9 +1334,9 @@ __mmplayer_gst_pending_seek(mm_player_t *player)
 }
 
 static void
-__mmplayer_gst_set_async(mm_player_t *player, gboolean async, enum MMPlayerSinkType type)
+__mmplayer_gst_set_async(mmplayer_t *player, gboolean async, enum mmplayer_sink_type  type)
 {
-       MMPlayerGstElement *videobin = NULL, *audiobin = NULL, *textbin = NULL;
+       mmplayer_gst_element_t *videobin = NULL, *audiobin = NULL, *textbin = NULL;
 
        MMPLAYER_RETURN_IF_FAIL(player && player->pipeline);
 
@@ -1357,9 +1359,9 @@ __mmplayer_gst_set_async(mm_player_t *player, gboolean async, enum MMPlayerSinkT
 }
 
 static void
-__mmplayer_drop_subtitle(mm_player_t *player, gboolean is_drop)
+__mmplayer_drop_subtitle(mmplayer_t *player, gboolean is_drop)
 {
-       MMPlayerGstElement *textbin;
+       mmplayer_gst_element_t *textbin;
        MMPLAYER_FENTER();
 
        MMPLAYER_RETURN_IF_FAIL(player &&
@@ -1392,7 +1394,7 @@ __mmplayer_drop_subtitle(mm_player_t *player, gboolean is_drop)
 }
 
 static void
-__mmplayer_gst_handle_eos_message(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_handle_eos_message(mmplayer_t *player, GstMessage *msg)
 {
        MMHandleType attrs = 0;
        gint count = 0;
@@ -1409,8 +1411,8 @@ __mmplayer_gst_handle_eos_message(mm_player_t *player, GstMessage *msg)
        if (player->pipeline && player->pipeline->textbin)
                __mmplayer_drop_subtitle(player, TRUE);
 
-       if ((player->audio_stream_render_cb) && (!player->audio_stream_sink_sync))
-               __mmplayer_audio_stream_clear_buffer(player, TRUE);
+       if ((player->audio_decoded_cb) && (player->audio_extract_opt & MM_PLAYER_AUDIO_EXTRACT_NO_SYNC_WITH_CLOCK))
+               _mmplayer_audio_stream_clear_buffer(player, TRUE);
 
        /* rewind if repeat count is greater then zero */
        /* get play count */
@@ -1423,7 +1425,7 @@ __mmplayer_gst_handle_eos_message(mm_player_t *player, GstMessage *msg)
                if (count == -1 || player->playback_rate < 0.0) /* default value is 1 */ {
                        if (player->playback_rate < 0.0) {
                                player->resumed_by_rewind = TRUE;
-                               _mmplayer_set_mute((MMHandleType)player, 0);
+                               _mmplayer_set_mute((MMHandleType)player, false);
                                MMPLAYER_POST_MSG(player, MM_MESSAGE_RESUMED_BY_REW, NULL);
                        }
 
@@ -1451,7 +1453,7 @@ __mmplayer_gst_handle_eos_message(mm_player_t *player, GstMessage *msg)
 }
 
 static void
-__mmplayer_gst_handle_error_message(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_handle_error_message(mmplayer_t *player, GstMessage *msg)
 {
        GError *error = NULL;
        gchar *debug = NULL;
@@ -1471,7 +1473,7 @@ __mmplayer_gst_handle_error_message(mm_player_t *player, GstMessage *msg)
                __mmplayer_handle_streaming_error(player, msg);
 
                /* dump state of all element */
-               __mmplayer_dump_pipeline_state(player);
+               _mmplayer_dump_pipeline_state(player);
        } else {
                /* traslate gst error code to msl error code. then post it
                 * to application if needed
@@ -1490,7 +1492,7 @@ __mmplayer_gst_handle_error_message(mm_player_t *player, GstMessage *msg)
 }
 
 static void
-__mmplayer_gst_handle_buffering_message(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_handle_buffering_message(mmplayer_t *player, GstMessage *msg)
 {
        MMMessageParamType msg_param = {0, };
        int bRet = MM_ERROR_NONE;
@@ -1609,9 +1611,9 @@ __mmplayer_gst_handle_buffering_message(mm_player_t *player, GstMessage *msg)
 }
 
 static void
-__mmplayer_gst_handle_state_message(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_handle_state_message(mmplayer_t *player, GstMessage *msg)
 {
-       MMPlayerGstElement *mainbin;
+       mmplayer_gst_element_t *mainbin;
        const GValue *voldstate, *vnewstate, *vpending;
        GstState oldstate = GST_STATE_NULL;
        GstState newstate = GST_STATE_NULL;
@@ -1653,7 +1655,7 @@ __mmplayer_gst_handle_state_message(mm_player_t *player, GstMessage *msg)
                        int retVal = MM_ERROR_NONE;
                        LOGD("trying to play from (%"G_GINT64_FORMAT") pending position", player->pending_seek.pos);
 
-                       retVal = __mmplayer_gst_set_position(player, player->pending_seek.pos, TRUE);
+                       retVal = _mmplayer_gst_set_position(player, player->pending_seek.pos, TRUE);
 
                        if (MM_ERROR_NONE != retVal)
                                LOGE("failed to seek pending postion. just keep staying current position.");
@@ -1682,7 +1684,7 @@ __mmplayer_gst_handle_state_message(mm_player_t *player, GstMessage *msg)
                                MMPLAYER_SET_STATE(player, MM_PLAYER_STATE_PAUSED);
 
                                if (MMPLAYER_IS_STREAMING(player) && (player->streamer))
-                                       __mm_player_streaming_set_content_bitrate(player->streamer,
+                                       _mm_player_streaming_set_content_bitrate(player->streamer,
                                                player->total_maximum_bitrate, player->total_bitrate);
 
                                if (player->pending_seek.is_pending) {
@@ -1719,7 +1721,7 @@ __mmplayer_gst_handle_state_message(mm_player_t *player, GstMessage *msg)
                        }
 
                        if (player->gapless.stream_changed) {
-                               __mmplayer_update_content_attrs(player, ATTR_ALL);
+                               _mmplayer_update_content_attrs(player, ATTR_ALL);
                                player->gapless.stream_changed = FALSE;
                        }
 
@@ -1741,21 +1743,14 @@ __mmplayer_gst_handle_state_message(mm_player_t *player, GstMessage *msg)
 }
 
 static void
-__mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_handle_element_message(mmplayer_t *player, GstMessage *msg)
 {
        const gchar *structure_name;
        gint count = 0, idx = 0;
-       MMHandleType attrs = 0;
 
        MMPLAYER_FENTER();
        MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->mainbin);
 
-       attrs = MMPLAYER_GET_ATTRS(player);
-       if (!attrs) {
-               LOGE("Failed to get content attribute");
-               return;
-       }
-
        if (gst_message_get_structure(msg) == NULL)
                return;
 
@@ -1779,7 +1774,7 @@ __mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg)
 
                        count = g_list_length(player->adaptive_info.var_list);
                        if (count > 0) {
-                               VariantData *temp = NULL;
+                               stream_variant_t *temp = NULL;
 
                                /* print out for debug */
                                LOGD("num of variant_info %d", count);
@@ -1797,19 +1792,21 @@ __mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg)
                gint extra_num_buffers = 0;
 
                if (gst_structure_get_int(gst_message_get_structure(msg), "num_buffers", &num_buffers)) {
-                       player->video_num_buffers = num_buffers;
-                       LOGD("video_num_buffers : %d", player->video_num_buffers);
+                       LOGD("video_num_buffers : %d", num_buffers);
+                       mm_player_set_attribute((MMHandleType)player, NULL,
+                                       MM_PLAYER_VIDEO_BUFFER_TOTAL_SIZE, num_buffers, NULL);
                }
 
                if (gst_structure_get_int(gst_message_get_structure(msg), "extra_num_buffers", &extra_num_buffers)) {
-                       player->video_extra_num_buffers = extra_num_buffers;
                        LOGD("num_of_vout_extra num buffers : %d", extra_num_buffers);
+                       mm_player_set_attribute((MMHandleType)player, NULL,
+                                       MM_PLAYER_VIDEO_BUFFER_EXTRA_SIZE, extra_num_buffers, NULL);
                }
                return;
        }
 
        if (!strcmp(structure_name, "Ext_Sub_Language_List"))
-               __mmplayer_track_update_text_attr_info(player, msg);
+               _mmplayer_track_update_text_attr_info(player, msg);
 
        /* custom message */
        if (!strcmp(structure_name, "audio_codec_not_supported")) {
@@ -1827,39 +1824,36 @@ __mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg)
                gchar *video_codec = NULL;
                gchar *video_frame_size = NULL;
 
-               gst_structure_get(gst_message_get_structure(msg), "rtsp_duration", G_TYPE_UINT64, &player->duration, NULL);
+               gst_structure_get(gst_message_get_structure(msg),
+                                       "rtsp_duration", G_TYPE_UINT64, &player->duration, NULL);
                LOGD("rtsp duration : %"G_GINT64_FORMAT" msec", GST_TIME_AS_MSECONDS(player->duration));
-               player->streaming_type = __mmplayer_get_stream_service_type(player);
+               player->streaming_type = _mmplayer_get_stream_service_type(player);
 
-               gst_structure_get(gst_message_get_structure(msg), "rtsp_audio_codec", G_TYPE_STRING, &audio_codec, NULL);
+               gst_structure_get(gst_message_get_structure(msg),
+                                       "rtsp_audio_codec", G_TYPE_STRING, &audio_codec, NULL);
                LOGD("rtsp_audio_codec : %s", audio_codec);
                if (audio_codec)
-                       mm_attrs_set_string_by_name(attrs, "content_audio_codec", audio_codec);
+                       mm_player_set_attribute((MMHandleType)player, NULL,
+                                       "content_audio_codec", audio_codec, strlen(audio_codec), NULL);
 
-               gst_structure_get(gst_message_get_structure(msg), "rtsp_video_codec", G_TYPE_STRING, &video_codec, NULL);
+               gst_structure_get(gst_message_get_structure(msg),
+                                       "rtsp_video_codec", G_TYPE_STRING, &video_codec, NULL);
                LOGD("rtsp_video_codec : %s", video_codec);
                if (video_codec)
-                       mm_attrs_set_string_by_name(attrs, "content_video_codec", video_codec);
+                       mm_player_set_attribute((MMHandleType)player, NULL,
+                                       "content_video_codec", video_codec, strlen(video_codec), NULL);
 
-               gst_structure_get(gst_message_get_structure(msg), "rtsp_video_frame_size", G_TYPE_STRING, &video_frame_size, NULL);
+               gst_structure_get(gst_message_get_structure(msg),
+                                       "rtsp_video_frame_size", G_TYPE_STRING, &video_frame_size, NULL);
                LOGD("rtsp_video_frame_size : %s", video_frame_size);
                if (video_frame_size) {
-                       char *seperator = strchr(video_frame_size, '-');
-                       if (seperator) {
-                               char video_width[10] = {0,};
-                               int frame_size_len = strlen(video_frame_size);
-                               int separtor_len = strlen(seperator);
-
-                               strncpy(video_width, video_frame_size, (frame_size_len - separtor_len));
-                               mm_attrs_set_int_by_name(attrs, "content_video_width", atoi(video_width));
-
-                               seperator++;
-                               mm_attrs_set_int_by_name(attrs, "content_video_height", atoi(seperator));
-                       }
+                       gchar **res_str = g_strsplit(video_frame_size, "-", 0);
+                       mm_player_set_attribute((MMHandleType)player, NULL,
+                               MM_PLAYER_VIDEO_WIDTH, atoi(res_str[0]),
+                               MM_PLAYER_VIDEO_HEIGHT, atoi(res_str[1]),
+                               NULL);
+                       g_strfreev(res_str);
                }
-
-               if (mm_attrs_commit_all(attrs))
-                       LOGE("failed to commit.");
        }
 
        MMPLAYER_FLEAVE();
@@ -1867,9 +1861,9 @@ __mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg)
 }
 
 static void
-__mmplayer_gst_handle_async_done_message(mm_player_t *player, GstMessage *msg)
+__mmplayer_gst_handle_async_done_message(mmplayer_t *player, GstMessage *msg)
 {
-       MMPlayerGstElement *mainbin;
+       mmplayer_gst_element_t *mainbin;
 
        MMPLAYER_FENTER();
        MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->mainbin);
@@ -1933,7 +1927,7 @@ __mmplayer_gst_handle_async_done_message(mm_player_t *player, GstMessage *msg)
 static void
 __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
 {
-       mm_player_t *player = (mm_player_t *)(data);
+       mmplayer_t *player = (mmplayer_t *)(data);
 
        MMPLAYER_RETURN_IF_FAIL(player);
        MMPLAYER_RETURN_IF_FAIL(msg && GST_IS_MESSAGE(msg));
@@ -1949,6 +1943,7 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
                break;
 
        case GST_MESSAGE_ERROR:
+               _mmplayer_set_reconfigure_state(player, FALSE);
                __mmplayer_gst_handle_error_message(player, msg);
                break;
 
@@ -2000,8 +1995,8 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
 
                                if (need_new_clock) {
                                        LOGD("Provide clock is TRUE, do pause->resume");
-                                       __mmplayer_gst_pause(player, FALSE);
-                                       __mmplayer_gst_resume(player, FALSE);
+                                       _mmplayer_gst_pause(player, FALSE);
+                                       _mmplayer_gst_resume(player, FALSE);
                                }
                        }
                        break;
@@ -2033,8 +2028,14 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
        case GST_MESSAGE_ASYNC_DONE:
                __mmplayer_gst_handle_async_done_message(player, msg);
                break;
+       case GST_MESSAGE_STREAM_COLLECTION:
+               LOGD("GST_MESSAGE_STREAM_COLLECTION : %s", GST_ELEMENT_NAME(GST_MESSAGE_SRC(msg)));
+               break;
+       case GST_MESSAGE_STREAMS_SELECTED:
+               LOGD("GST_MESSAGE_STREAMS_SELECTED : %s", GST_ELEMENT_NAME(GST_MESSAGE_SRC(msg)));
+               break;
 
-       #if 0 /* delete unnecessary logs */
+#ifdef __DEBUG__
        case GST_MESSAGE_REQUEST_STATE:         LOGD("GST_MESSAGE_REQUEST_STATE"); break;
        case GST_MESSAGE_STEP_START:            LOGD("GST_MESSAGE_STEP_START"); break;
        case GST_MESSAGE_QOS:                           LOGD("GST_MESSAGE_QOS"); break;
@@ -2050,7 +2051,7 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
        case GST_MESSAGE_SEGMENT_START:         LOGD("GST_MESSAGE_SEGMENT_START"); break;
        case GST_MESSAGE_SEGMENT_DONE:          LOGD("GST_MESSAGE_SEGMENT_DONE"); break;
        case GST_MESSAGE_LATENCY:                       LOGD("GST_MESSAGE_LATENCY"); break;
-       #endif
+#endif
 
        default:
                break;
@@ -2063,7 +2064,7 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
 static GstBusSyncReply
 __mmplayer_gst_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data)
 {
-       mm_player_t *player = (mm_player_t *)data;
+       mmplayer_t *player = (mmplayer_t *)data;
        GstBusSyncReply reply = GST_BUS_DROP;
 
        if (!(player->pipeline && player->pipeline->mainbin)) {
@@ -2080,7 +2081,7 @@ __mmplayer_gst_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data
        case GST_MESSAGE_TAG:
                __mmplayer_gst_extract_tag_from_msg(player, message);
 
-               #if 0 // debug
+#ifdef __DEBUG__
                {
                        GstTagList *tags = NULL;
 
@@ -2095,12 +2096,24 @@ __mmplayer_gst_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data
                        }
                        break;
                }
-               #endif
+#endif
                break;
 
        case GST_MESSAGE_DURATION_CHANGED:
                __mmplayer_gst_handle_duration(player, message);
                break;
+       case GST_MESSAGE_ELEMENT:
+               {
+                       const gchar *klass = NULL;
+                       klass = gst_element_factory_get_metadata
+                               (gst_element_get_factory((GstElement *)message->src), GST_ELEMENT_METADATA_KLASS);
+                       if (!klass || !g_strrstr(klass, "Codec/Decoder")) {
+                               reply = GST_BUS_PASS;
+                               break;
+                       }
+                       __mmplayer_gst_handle_element_message(player, message);
+               }
+               break;
        case GST_MESSAGE_ASYNC_DONE:
                /* NOTE:Don't call gst_callback directly
                 * because previous frame can be showed even though this message is received for seek.
@@ -2120,7 +2133,7 @@ static void
 __mmplayer_gst_appsrc_feed_data_mem(GstElement *element, guint size, gpointer user_data)
 {
        GstElement *appsrc = element;
-       MMPlayerInputBuffer *buf = (MMPlayerInputBuffer *)user_data;
+       mmplayer_input_buffer_t *buf = (mmplayer_input_buffer_t *)user_data;
        GstBuffer *buffer = NULL;
        GstFlowReturn ret = GST_FLOW_OK;
        gint len = size;
@@ -2148,7 +2161,9 @@ __mmplayer_gst_appsrc_feed_data_mem(GstElement *element, guint size, gpointer us
        GST_BUFFER_OFFSET(buffer) = (guint64)buf->offset;
        GST_BUFFER_OFFSET_END(buffer) = (guint64)(buf->offset + len);
 
-       //LOGD("feed buffer %p, offset %u-%u length %u", buffer, buf->offset, (buf->offset+len), len);
+#ifdef __DEBUG__
+       LOGD("feed buffer %p, offset %u-%u length %u", buffer, buf->offset, (buf->offset+len), len);
+#endif
        g_signal_emit_by_name(appsrc, "push-buffer", buffer, &ret);
 
        buf->offset += len;
@@ -2157,7 +2172,7 @@ __mmplayer_gst_appsrc_feed_data_mem(GstElement *element, guint size, gpointer us
 static gboolean
 __mmplayer_gst_appsrc_seek_data_mem(GstElement *element, guint64 size, gpointer user_data)
 {
-       MMPlayerInputBuffer *buf = (MMPlayerInputBuffer *)user_data;
+       mmplayer_input_buffer_t *buf = (mmplayer_input_buffer_t *)user_data;
 
        MMPLAYER_RETURN_VAL_IF_FAIL(buf, FALSE);
 
@@ -2169,96 +2184,96 @@ __mmplayer_gst_appsrc_seek_data_mem(GstElement *element, guint64 size, gpointer
 void
 __mmplayer_gst_appsrc_feed_data(GstElement *element, guint size, gpointer user_data)
 {
-       mm_player_t *player  = (mm_player_t *)user_data;
-       MMPlayerStreamType type = MM_PLAYER_STREAM_TYPE_DEFAULT;
+       mmplayer_t *player  = (mmplayer_t *)user_data;
+       mmplayer_stream_type_e stream_type = MM_PLAYER_STREAM_TYPE_DEFAULT;
+       MMMessageParamType msg_param = {0,};
        guint64 current_level_bytes = 0;
 
        MMPLAYER_RETURN_IF_FAIL(player);
 
        if (g_strrstr(GST_ELEMENT_NAME(element), "audio")) {
-               type = MM_PLAYER_STREAM_TYPE_AUDIO;
+               stream_type = MM_PLAYER_STREAM_TYPE_AUDIO;
        } else if (g_strrstr(GST_ELEMENT_NAME(element), "video")) {
-               type = MM_PLAYER_STREAM_TYPE_VIDEO;
-       } else if (g_strrstr(GST_ELEMENT_NAME(element), "subtitle")) {
-               type = MM_PLAYER_STREAM_TYPE_TEXT;
+               stream_type = MM_PLAYER_STREAM_TYPE_VIDEO;
        } else {
-               LOGE("can not enter here");
+               LOGW("invalid feed-data signal from %s", GST_ELEMENT_NAME(element));
                return;
        }
 
        g_object_get(G_OBJECT(element), "current-level-bytes", &current_level_bytes, NULL);
 
-       LOGI("type: %d, level: %"G_GUINT64_FORMAT, type, current_level_bytes);
+       LOGI("stream type: %d, level: %"G_GUINT64_FORMAT, stream_type, current_level_bytes);
 
-       MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
-       if (player->media_stream_buffer_status_cb[type])
-               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param[type]);
-       MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
+       msg_param.union_type = MM_MSG_UNION_BUFFER_STATUS;
+       msg_param.buffer_status.stream_type = stream_type;
+       msg_param.buffer_status.status = MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN;
+       msg_param.buffer_status.bytes = current_level_bytes;
+
+       MMPLAYER_POST_MSG(player, MM_MESSAGE_PUSH_BUFFER_STATUS, &msg_param);
 }
 
 void
 __mmplayer_gst_appsrc_enough_data(GstElement *element, gpointer user_data)
 {
-       mm_player_t *player  = (mm_player_t *)user_data;
-       MMPlayerStreamType type = MM_PLAYER_STREAM_TYPE_DEFAULT;
+       mmplayer_t *player  = (mmplayer_t *)user_data;
+       mmplayer_stream_type_e stream_type = MM_PLAYER_STREAM_TYPE_DEFAULT;
+       MMMessageParamType msg_param = {0,};
        guint64 current_level_bytes = 0;
 
        MMPLAYER_RETURN_IF_FAIL(player);
 
        if (g_strrstr(GST_ELEMENT_NAME(element), "audio")) {
-               type = MM_PLAYER_STREAM_TYPE_AUDIO;
+               stream_type = MM_PLAYER_STREAM_TYPE_AUDIO;
        } else if (g_strrstr(GST_ELEMENT_NAME(element), "video")) {
-               type = MM_PLAYER_STREAM_TYPE_VIDEO;
-       } else if (g_strrstr(GST_ELEMENT_NAME(element), "subtitle")) {
-               type = MM_PLAYER_STREAM_TYPE_TEXT;
+               stream_type = MM_PLAYER_STREAM_TYPE_VIDEO;
        } else {
-               LOGE("can not enter here");
+               LOGW("invalid enough-data signal from %s", GST_ELEMENT_NAME(element));
                return;
        }
 
-       LOGI("type: %d, buffer is full", type);
-
        g_object_get(G_OBJECT(element), "current-level-bytes", &current_level_bytes, NULL);
 
-       MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
+       LOGI("stream type: %d, level: %"G_GUINT64_FORMAT, stream_type, current_level_bytes);
 
-       if (player->media_stream_buffer_status_cb[type])
-               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW, current_level_bytes, player->buffer_cb_user_param[type]);
+       msg_param.union_type = MM_MSG_UNION_BUFFER_STATUS;
+       msg_param.buffer_status.stream_type = stream_type;
+       msg_param.buffer_status.status = MM_PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW;
+       msg_param.buffer_status.bytes = current_level_bytes;
 
-       MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
+       MMPLAYER_POST_MSG(player, MM_MESSAGE_PUSH_BUFFER_STATUS, &msg_param);
 }
 
 gboolean
 __mmplayer_gst_appsrc_seek_data(GstElement *element, guint64 position, gpointer user_data)
 {
-       mm_player_t *player  = (mm_player_t *)user_data;
-       MMPlayerStreamType type = MM_PLAYER_STREAM_TYPE_DEFAULT;
+       mmplayer_t *player  = (mmplayer_t *)user_data;
+       mmplayer_stream_type_e stream_type = MM_PLAYER_STREAM_TYPE_DEFAULT;
+       MMMessageParamType msg_param = {0,};
 
        MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE);
 
        if (g_strrstr(GST_ELEMENT_NAME(element), "audio")) {
-               type = MM_PLAYER_STREAM_TYPE_AUDIO;
+               stream_type = MM_PLAYER_STREAM_TYPE_AUDIO;
        } else if (g_strrstr(GST_ELEMENT_NAME(element), "video")) {
-               type = MM_PLAYER_STREAM_TYPE_VIDEO;
-       } else if (g_strrstr(GST_ELEMENT_NAME(element), "subtitle")) {
-               type = MM_PLAYER_STREAM_TYPE_TEXT;
+               stream_type = MM_PLAYER_STREAM_TYPE_VIDEO;
        } else {
-               LOGE("can not enter here");
+               LOGW("invalid seek-data signal from %s", GST_ELEMENT_NAME(element));
                return TRUE;
        }
 
-       LOGD("type: %d, pos: %"G_GUINT64_FORMAT, type, position);
-       MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
+       LOGD("stream type: %d, pos: %"G_GUINT64_FORMAT, stream_type, position);
 
-       if (player->media_stream_seek_data_cb[type])
-               player->media_stream_seek_data_cb[type](type, position, player->seek_cb_user_param[type]);
-       MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
+       msg_param.union_type = MM_MSG_UNION_SEEK_DATA;
+       msg_param.seek_data.stream_type = stream_type;
+       msg_param.seek_data.offset = position;
+
+       MMPLAYER_POST_MSG(player, MM_MESSAGE_PUSH_BUFFER_SEEK_DATA, &msg_param);
 
        return TRUE;
 }
 
 static gboolean
-__mmplayer_gst_create_es_decoder(mm_player_t *player, MMPlayerStreamType type, GstPad *srcpad)
+__mmplayer_gst_create_es_decoder(mmplayer_t *player, mmplayer_stream_type_e type, GstPad *srcpad)
 {
 #define MAX_LEN_NAME 20
 
@@ -2266,9 +2281,9 @@ __mmplayer_gst_create_es_decoder(mm_player_t *player, MMPlayerStreamType type, G
        GstPad *sinkpad = NULL;
        gchar *prefix = NULL;
        gchar dec_name[MAX_LEN_NAME] = {0, };
-       enum MainElementID elem_id = MMPLAYER_M_NUM;
+       main_element_id_e elem_id = MMPLAYER_M_NUM;
 
-       MMPlayerGstElement *mainbin = NULL;
+       mmplayer_gst_element_t *mainbin = NULL;
        GstElement *decodebin = NULL;
        GstCaps *dec_caps = NULL;
 
@@ -2312,17 +2327,21 @@ __mmplayer_gst_create_es_decoder(mm_player_t *player, MMPlayerStreamType type, G
        mainbin[elem_id].gst = decodebin;
 
        /* raw pad handling signal */
-       __mmplayer_add_signal_connection(player, G_OBJECT(decodebin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "pad-added",
-                                                                               G_CALLBACK(__mmplayer_gst_decode_pad_added), (gpointer)player);
+       _mmplayer_add_signal_connection(player, G_OBJECT(decodebin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "pad-added",
+                                                                               G_CALLBACK(_mmplayer_gst_decode_pad_added), (gpointer)player);
 
        /* This signal is emitted whenever decodebin finds a new stream. It is emitted
        before looking for any elements that can handle that stream.*/
-       __mmplayer_add_signal_connection(player, G_OBJECT(decodebin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "autoplug-select",
-                                                                               G_CALLBACK(__mmplayer_gst_decode_autoplug_select), (gpointer)player);
+       _mmplayer_add_signal_connection(player, G_OBJECT(decodebin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "autoplug-select",
+                                                                               G_CALLBACK(_mmplayer_gst_decode_autoplug_select), (gpointer)player);
+
+       if (player->need_video_dec_sorting || player->need_audio_dec_sorting)
+               _mmplayer_add_signal_connection(player, G_OBJECT(decodebin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "autoplug-sort",
+                                                       G_CALLBACK(_mmplayer_gst_decode_autoplug_sort), (gpointer)player);
 
        /* This signal is emitted when a element is added to the bin.*/
-       __mmplayer_add_signal_connection(player, G_OBJECT(decodebin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "element-added",
-                                                                               G_CALLBACK(__mmplayer_gst_element_added), (gpointer)player);
+       _mmplayer_add_signal_connection(player, G_OBJECT(decodebin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "element-added",
+                                                                               G_CALLBACK(_mmplayer_gst_element_added), (gpointer)player);
 
        if (!gst_bin_add(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), decodebin)) {
                LOGE("failed to add new decodebin");
@@ -2331,7 +2350,9 @@ __mmplayer_gst_create_es_decoder(mm_player_t *player, MMPlayerStreamType type, G
 
        dec_caps = gst_pad_query_caps(srcpad, NULL);
        if (dec_caps) {
-               //LOGD("got pad %s:%s , dec_caps %" GST_PTR_FORMAT, GST_DEBUG_PAD_NAME(srcpad), dec_caps);
+#ifdef __DEBUG__
+               LOGD("got pad %s:%s , dec_caps %" GST_PTR_FORMAT, GST_DEBUG_PAD_NAME(srcpad), dec_caps);
+#endif
                g_object_set(G_OBJECT(decodebin), "sink-caps", dec_caps, NULL);
                gst_caps_unref(dec_caps);
        }
@@ -2364,12 +2385,12 @@ ERROR:
 }
 
 static gboolean
-__mmplayer_gst_create_es_path(mm_player_t *player, MMPlayerStreamType type, GstCaps *caps)
+__mmplayer_gst_create_es_path(mmplayer_t *player, mmplayer_stream_type_e type, GstCaps *caps)
 {
 #define MAX_LEN_NAME 20
-       MMPlayerGstElement *mainbin = NULL;
+       mmplayer_gst_element_t *mainbin = NULL;
        gchar *prefix = NULL;
-       enum MainElementID src_id = MMPLAYER_M_NUM, queue_id = MMPLAYER_M_NUM;
+       main_element_id_e src_id = MMPLAYER_M_NUM, queue_id = MMPLAYER_M_NUM;
 
        gchar src_name[MAX_LEN_NAME] = {0, }, queue_name[MAX_LEN_NAME] = {0, };
        GstElement *src = NULL, *queue = NULL;
@@ -2435,11 +2456,11 @@ __mmplayer_gst_create_es_path(mm_player_t *player, MMPlayerStreamType type, GstC
        /*Fix Seek External Demuxer: set audio and video appsrc as seekable */
        gst_app_src_set_stream_type((GstAppSrc*)G_OBJECT(src), GST_APP_STREAM_TYPE_SEEKABLE);
 
-       __mmplayer_add_signal_connection(player, G_OBJECT(src), MM_PLAYER_SIGNAL_TYPE_OTHERS, "seek-data",
+       _mmplayer_add_signal_connection(player, G_OBJECT(src), MM_PLAYER_SIGNAL_TYPE_OTHERS, "seek-data",
                                                                                        G_CALLBACK(__mmplayer_gst_appsrc_seek_data), (gpointer)player);
-       __mmplayer_add_signal_connection(player, G_OBJECT(src), MM_PLAYER_SIGNAL_TYPE_OTHERS, "need-data",
+       _mmplayer_add_signal_connection(player, G_OBJECT(src), MM_PLAYER_SIGNAL_TYPE_OTHERS, "need-data",
                                                                                        G_CALLBACK(__mmplayer_gst_appsrc_feed_data), (gpointer)player);
-       __mmplayer_add_signal_connection(player, G_OBJECT(src), MM_PLAYER_SIGNAL_TYPE_OTHERS, "enough-data",
+       _mmplayer_add_signal_connection(player, G_OBJECT(src), MM_PLAYER_SIGNAL_TYPE_OTHERS, "enough-data",
                                                                                        G_CALLBACK(__mmplayer_gst_appsrc_enough_data), (gpointer)player);
 
        /* create queue */
@@ -2476,7 +2497,7 @@ __mmplayer_gst_create_es_path(mm_player_t *player, MMPlayerStreamType type, GstC
        }
 
        if (type == MM_PLAYER_STREAM_TYPE_TEXT) {
-               __mmplayer_gst_create_decoder(player, srcpad, caps);
+               _mmplayer_gst_create_decoder(player, srcpad, caps);
        } else {
                if (!__mmplayer_gst_create_es_decoder(player, type, srcpad)) {
                        LOGE("failed to create decoder");
@@ -2514,7 +2535,7 @@ __mmplayer_gst_rtp_dynamic_pad(GstElement *element, GstPad *pad, gpointer data)
        GstStructure *str = NULL;
        const gchar *name = NULL;
 
-       mm_player_t *player = (mm_player_t *)data;
+       mmplayer_t *player = (mmplayer_t *)data;
 
        MMPLAYER_FENTER();
 
@@ -2543,7 +2564,7 @@ __mmplayer_gst_rtp_dynamic_pad(GstElement *element, GstPad *pad, gpointer data)
                gint stype = 0;
                mm_attrs_get_int_by_name(player->attrs, "display_surface_type", &stype);
 
-               if ((stype == MM_DISPLAY_SURFACE_NULL) && (!player->set_mode.media_packet_video_stream)) {
+               if ((stype == MM_DISPLAY_SURFACE_NULL) && (!player->set_mode.video_export)) {
                        if (player->v_stream_caps) {
                                gst_caps_unref(player->v_stream_caps);
                                player->v_stream_caps = NULL;
@@ -2555,7 +2576,7 @@ __mmplayer_gst_rtp_dynamic_pad(GstElement *element, GstPad *pad, gpointer data)
                }
        }
 
-       if (!__mmplayer_gst_create_decoder(player, pad, caps)) {
+       if (!_mmplayer_gst_create_decoder(player, pad, caps)) {
                LOGE("failed to autoplug for caps");
                goto ERROR;
        }
@@ -2626,7 +2647,7 @@ ERROR:
 static void
 __mmplayer_gst_rtp_no_more_pads(GstElement *element,  gpointer data)
 {
-       mm_player_t *player = (mm_player_t *)data;
+       mmplayer_t *player = (mmplayer_t *)data;
 
        MMPLAYER_FENTER();
 
@@ -2643,9 +2664,9 @@ __mmplayer_gst_rtp_no_more_pads(GstElement *element,  gpointer data)
        if (player->num_dynamic_pad == 0) {
                LOGD("it seems pad caps is directely used for autoplugging. removing fakesink now");
 
-               if (!__mmplayer_gst_remove_fakesink(player,
+               if (!_mmplayer_gst_remove_fakesink(player,
                        &player->pipeline->mainbin[MMPLAYER_M_SRC_FAKESINK]))
-                       /* NOTE : __mmplayer_pipeline_complete() can be called several time. because
+                       /* NOTE : _mmplayer_pipeline_complete() can be called several time. because
                         * signaling mechanism(pad-added, no-more-pad, new-decoded-pad) from various
                         * source element are not same. To overcome this situation, this function will called
                         * several places and several times. Therefore, this is not an error case.
@@ -2662,7 +2683,7 @@ __mmplayer_gst_rtp_no_more_pads(GstElement *element,  gpointer data)
 }
 
 static GstElement *
-__mmplayer_gst_make_rtsp_src(mm_player_t *player)
+__mmplayer_gst_make_rtsp_src(mmplayer_t *player)
 {
        GstElement *element = NULL;
        gchar *user_agent = NULL;
@@ -2694,22 +2715,261 @@ __mmplayer_gst_make_rtsp_src(mm_player_t *player)
        if (user_agent)
                g_object_set(G_OBJECT(element), "user-agent", user_agent, NULL);
 
-       __mmplayer_add_signal_connection(player, G_OBJECT(element), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "pad-added",
+       _mmplayer_add_signal_connection(player, G_OBJECT(element), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "pad-added",
                                                                        G_CALLBACK(__mmplayer_gst_rtp_dynamic_pad), (gpointer)player);
-       __mmplayer_add_signal_connection(player, G_OBJECT(element), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "no-more-pads",
+       _mmplayer_add_signal_connection(player, G_OBJECT(element), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "no-more-pads",
                                                                        G_CALLBACK(__mmplayer_gst_rtp_no_more_pads), (gpointer)player);
 
        MMPLAYER_FLEAVE();
        return element;
 }
 
+void __mmplayer_http_src_setup(GstElement *element, GstElement *source, gpointer data)
+{
+#define HTTP_SOURCE_BLOCK_SIZE (64 * 1024)
+
+       mmplayer_t *player = (mmplayer_t *)data;
+       MMHandleType attrs = 0;
+       gchar *user_agent, *cookies, **cookie_list;
+       gint http_timeout = DEFAULT_HTTP_TIMEOUT;
+       user_agent = cookies = NULL;
+       cookie_list = NULL;
+
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_IF_FAIL(player);
+
+       LOGD("source element %s", GST_ELEMENT_NAME(source));
+
+       /* get profile attribute */
+       attrs = MMPLAYER_GET_ATTRS(player);
+       if (!attrs) {
+               LOGE("failed to get content attribute");
+               return;
+       }
+
+       player->pipeline->mainbin[MMPLAYER_M_SRC].id = MMPLAYER_M_SRC;
+       player->pipeline->mainbin[MMPLAYER_M_SRC].gst = source;
+
+       /* get attribute */
+       mm_attrs_get_string_by_name(attrs, "streaming_cookie", &cookies);
+       mm_attrs_get_string_by_name(attrs, "streaming_user_agent", &user_agent);
+
+       if (player->ini.http_timeout != DEFAULT_HTTP_TIMEOUT)
+               http_timeout = player->ini.http_timeout;
+
+       /* get attribute */
+       SECURE_LOGD("cookies : %s", cookies);
+       SECURE_LOGD("user_agent :  %s", user_agent);
+       LOGD("timeout : %d", http_timeout);
+
+       /* setting property to streaming source */
+       g_object_set(G_OBJECT(source), "timeout", http_timeout, "blocksize", (unsigned long)(HTTP_SOURCE_BLOCK_SIZE), NULL);
+
+       /* parsing cookies */
+       if ((cookie_list = _mmplayer_get_cookie_list((const char *)cookies))) {
+               g_object_set(G_OBJECT(source), "cookies", cookie_list, NULL);
+               g_strfreev(cookie_list);
+       }
+
+       if (user_agent)
+               g_object_set(G_OBJECT(source), "user-agent", user_agent, NULL);
+
+       MMPLAYER_FLEAVE();
+       return;
+}
+
+gint __mmplayer_gst_select_stream (GstElement * uridecodebin, GstStreamCollection * collection,
+    GstStream * stream, gpointer data)
+{
+       GstStreamType stype = gst_stream_get_stream_type (stream);
+
+       if (stype & GST_STREAM_TYPE_AUDIO)
+               LOGW("AUDIO type 0x%X", stype);
+       else if (stype & GST_STREAM_TYPE_VIDEO)
+               LOGW("VIDEO type 0x%X", stype);
+       else if (stype & GST_STREAM_TYPE_TEXT)
+               LOGW("TEXT type 0x%X", stype);
+
+       return 1;
+}
+
+void
+__mmplayer_gst_deep_element_added(GstElement *bin, GstBin *child, GstElement *element, gpointer data)
+{
+       gchar *factory_name = NULL;
+       mmplayer_t *player = (mmplayer_t *)data;
+       mmplayer_gst_element_t *mainbin = NULL;
+
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->mainbin);
+
+       factory_name = GST_OBJECT_NAME(gst_element_get_factory(element));
+       mainbin = player->pipeline->mainbin;
+
+       LOGD("%s > %s > %s : %s", GST_ELEMENT_NAME(bin), GST_ELEMENT_NAME(child),
+               factory_name, GST_ELEMENT_NAME(element));
+
+       /* keep the first typefind reference only */
+       if (!mainbin[MMPLAYER_M_TYPEFIND].gst && g_strrstr(factory_name, "typefind")) {
+               mainbin[MMPLAYER_M_TYPEFIND].id = MMPLAYER_M_TYPEFIND;
+               mainbin[MMPLAYER_M_TYPEFIND].gst = element;
+
+               _mmplayer_add_signal_connection(player, G_OBJECT(element),
+                       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "have-type", G_CALLBACK(_mmplayer_typefind_have_type), (gpointer)player);
+
+       } else if (!mainbin[MMPLAYER_M_MUXED_S_BUFFER].gst && g_strrstr(factory_name, "queue2")) {
+
+               gint64 dur_bytes = 0L;
+               muxed_buffer_type_e type = MUXED_BUFFER_TYPE_MEM_QUEUE;
+
+               mainbin[MMPLAYER_M_MUXED_S_BUFFER].id = MMPLAYER_M_MUXED_S_BUFFER;
+               mainbin[MMPLAYER_M_MUXED_S_BUFFER].gst = element;
+
+               if (!gst_element_query_duration(mainbin[MMPLAYER_M_SRC].gst, GST_FORMAT_BYTES, &dur_bytes))
+                       LOGW("failed to get duration from source %s", GST_ELEMENT_NAME(mainbin[MMPLAYER_M_SRC].gst));
+
+               LOGD("type %s, dur_bytes = %"G_GINT64_FORMAT, player->type, dur_bytes);
+
+               /* 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 ((!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;
+                       }
+               } else {
+                       dur_bytes = 0;
+               }
+
+               _mm_player_streaming_set_queue2(player->streamer,
+                                                                               element,
+                                                                               FALSE,
+                                                                               type,
+                                                                               (guint64)dur_bytes); /* no meaning at the moment */
+
+       } else if (g_strrstr(factory_name, "parsebin")) {
+
+               if (!mainbin[MMPLAYER_M_DEMUXED_S_BUFFER].gst) {
+                       GstIterator *iter = NULL;
+                       GValue item = {0, };
+                       GstElement *ch_element = NULL;
+                       GstElementFactory *ch_factory = NULL;
+
+                       g_object_set(G_OBJECT(child), "message-forward", TRUE, NULL);
+
+                       iter = gst_bin_iterate_recurse(child);
+                       if (iter != NULL) {
+                               while (gst_iterator_next(iter, &item) == GST_ITERATOR_OK) {
+                                       ch_element = g_value_get_object(&item);
+                                       ch_factory = gst_element_get_factory(ch_element);
+
+                                       if (g_strrstr(GST_OBJECT_NAME(ch_factory), "multiqueue")) {
+                                               player->pipeline->mainbin[MMPLAYER_M_DEMUXED_S_BUFFER].id = MMPLAYER_M_DEMUXED_S_BUFFER;
+                                               player->pipeline->mainbin[MMPLAYER_M_DEMUXED_S_BUFFER].gst = ch_element;
+
+                                               if ((MMPLAYER_IS_HTTP_STREAMING(player)) ||
+                                                       (MMPLAYER_IS_HTTP_LIVE_STREAMING(player)) ||
+                                                       (MMPLAYER_IS_DASH_STREAMING(player))) {
+                                                       _mm_player_streaming_set_multiqueue(player->streamer, ch_element);
+                                               }
+                                               g_value_reset(&item);
+                                               break;
+                                       }
+                                       g_value_reset(&item);
+                               }
+                               gst_iterator_free(iter);
+                       }
+               }
+               mainbin[MMPLAYER_M_AUTOPLUG_PARSEBIN].id = MMPLAYER_M_AUTOPLUG_PARSEBIN;
+               mainbin[MMPLAYER_M_AUTOPLUG_PARSEBIN].gst = element;
+               _mmplayer_add_signal_connection(player, G_OBJECT(element),
+                       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "unknown-type", G_CALLBACK(_mmplayer_gst_decode_unknown_type), (gpointer)player);
+
+               _mmplayer_add_signal_connection(player, G_OBJECT(element),
+                       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "autoplug-continue", G_CALLBACK(_mmplayer_gst_decode_autoplug_continue), (gpointer)player);
+
+               if (player->need_video_dec_sorting || player->need_audio_dec_sorting)
+                       _mmplayer_add_signal_connection(player, G_OBJECT(element),
+                       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "autoplug-sort", G_CALLBACK(_mmplayer_gst_decode_autoplug_sort), (gpointer)player);
+
+               _mmplayer_add_signal_connection(player, G_OBJECT(element),
+                       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "autoplug-select", G_CALLBACK(_mmplayer_gst_decode_autoplug_select), (gpointer)player);
+
+       } else {
+               _mmplayer_gst_element_added((GstElement *)child, element, data);
+       }
+       return;
+}
+
+void
+__mmplayer_gst_deep_element_removed(GstElement *bin, GstBin *child, GstElement *element, gpointer data)
+{
+       LOGD("%s > %s > %s", GST_ELEMENT_NAME(bin), GST_ELEMENT_NAME(child), GST_ELEMENT_NAME(element));
+       return;
+}
+
 static GstElement *
-__mmplayer_gst_make_http_src(mm_player_t *player)
+__mmplayer_gst_make_uridecodebin(mmplayer_t *player)
 {
+       GstElement *uridecodebin3 = NULL;
+
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_VAL_IF_FAIL(player, NULL);
+
+       uridecodebin3 = gst_element_factory_make("uridecodebin3", "uridecodebin3");
+       if (!uridecodebin3) {
+               LOGE("failed to create uridecodebin3");
+               return NULL;
+       }
+
+       /* get attribute */
+       SECURE_LOGD("uri : %s", player->profile.uri);
+
+       /* setting property to streaming source */
+       g_object_set(G_OBJECT(uridecodebin3), "uri", player->profile.uri, "message-forward", TRUE, NULL);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "source-setup", G_CALLBACK(__mmplayer_http_src_setup), (gpointer)player);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "pad-added", G_CALLBACK(_mmplayer_gst_decode_pad_added), (gpointer)player);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "pad-removed", G_CALLBACK(_mmplayer_gst_decode_pad_removed), (gpointer)player);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "no-more-pads", G_CALLBACK(_mmplayer_gst_decode_no_more_pads), (gpointer)player);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "select-stream", G_CALLBACK(__mmplayer_gst_select_stream), (gpointer)player);
+
+/* FIXME: need to be added for gapless playback
+       _mmplayer_add_signal_connection(player, G_OBJECT(element),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "about-to-finish", G_CALLBACK(_mmplayer_gst_decode_drained), (gpointer)player);
+*/
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "deep-element-added", G_CALLBACK(__mmplayer_gst_deep_element_added), (gpointer)player);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "deep-element-removed", G_CALLBACK(__mmplayer_gst_deep_element_removed), (gpointer)player);
+
+       if (MMPLAYER_URL_HAS_DASH_SUFFIX(player))
+               LOGW("[DASH] this is still experimental feature");
+
+       MMPLAYER_FLEAVE();
+       return uridecodebin3;
+}
+
+static GstElement *
+__mmplayer_gst_make_http_src(mmplayer_t *player)
+{
+#define MAX_RETRY_COUNT 10
        GstElement *element = NULL;
        MMHandleType attrs = 0;
        gchar *user_agent, *cookies, **cookie_list;
        gint http_timeout = DEFAULT_HTTP_TIMEOUT;
+
        user_agent = cookies = NULL;
        cookie_list = NULL;
 
@@ -2746,10 +3006,11 @@ __mmplayer_gst_make_http_src(mm_player_t *player)
 
        /* setting property to streaming source */
        g_object_set(G_OBJECT(element), "location", player->profile.uri,
-                               "timeout", http_timeout, "blocksize", (unsigned long)(64 * 1024), NULL);
+                               "timeout", http_timeout, "blocksize", (unsigned long)(64 * 1024),
+                               "retries", MAX_RETRY_COUNT, NULL);
 
        /* parsing cookies */
-       if ((cookie_list = util_get_cookie_list((const char *)cookies))) {
+       if ((cookie_list = _mmplayer_get_cookie_list((const char *)cookies))) {
                g_object_set(G_OBJECT(element), "cookies", cookie_list, NULL);
                g_strfreev(cookie_list);
        }
@@ -2765,7 +3026,7 @@ __mmplayer_gst_make_http_src(mm_player_t *player)
 }
 
 static GstElement *
-__mmplayer_gst_make_file_src(mm_player_t *player)
+__mmplayer_gst_make_file_src(mmplayer_t *player)
 {
        GstElement *element = NULL;
 
@@ -2773,7 +3034,7 @@ __mmplayer_gst_make_file_src(mm_player_t *player)
        MMPLAYER_RETURN_VAL_IF_FAIL(player, NULL);
 
        LOGD("using filesrc for 'file://' handler");
-       if (!util_get_storage_info(player->profile.uri, &player->storage_info[MMPLAYER_PATH_VOD])) {
+       if (!_mmplayer_get_storage_info(player->profile.uri, &player->storage_info[MMPLAYER_PATH_VOD])) {
                LOGE("failed to get storage info");
                return NULL;
        }
@@ -2793,7 +3054,7 @@ __mmplayer_gst_make_file_src(mm_player_t *player)
 static gboolean
 __mmplayer_gst_msg_push(GstBus *bus, GstMessage *msg, gpointer data)
 {
-       mm_player_t *player = (mm_player_t *)data;
+       mmplayer_t *player = (mmplayer_t *)data;
 
        g_return_val_if_fail(player, FALSE);
        g_return_val_if_fail(msg && GST_IS_MESSAGE(msg), FALSE);
@@ -2812,7 +3073,7 @@ __mmplayer_gst_msg_push(GstBus *bus, GstMessage *msg, gpointer data)
 
 static gpointer __mmplayer_gst_bus_msg_thread(gpointer data)
 {
-       mm_player_t *player = (mm_player_t *)(data);
+       mmplayer_t *player = (mmplayer_t *)(data);
        GstMessage *msg = NULL;
        GstBus *bus = NULL;
 
@@ -2855,7 +3116,7 @@ static gpointer __mmplayer_gst_bus_msg_thread(gpointer data)
 }
 
 static int
-__mmplayer_gst_check_duration(mm_player_t *player, gint64 position)
+__mmplayer_gst_check_duration(mmplayer_t *player, gint64 position)
 {
        gint64 dur_nsec = 0;
 
@@ -2873,7 +3134,7 @@ __mmplayer_gst_check_duration(mm_player_t *player, gint64 position)
                        /* For RTSP Streaming , duration is not returned in READY state. So seek to the previous position does not work properly.
                         * Added a patch to postpone the actual seek when state changes to PLAY. Sending a fake SEEK_COMPLETED event to finish the current request. */
                        if ((MMPLAYER_IS_RTSP_STREAMING(player)) &&
-                               (__mmplayer_get_stream_service_type(player) == STREAMING_SERVICE_VOD)) {
+                               (_mmplayer_get_stream_service_type(player) == STREAMING_SERVICE_VOD)) {
                                player->pending_seek.is_pending = true;
                                player->pending_seek.pos = position;
                                player->seek_state = MMPLAYER_SEEK_NONE;
@@ -2897,7 +3158,7 @@ __mmplayer_gst_check_duration(mm_player_t *player, gint64 position)
 }
 
 static gboolean
-__mmplayer_gst_check_seekable(mm_player_t *player)
+__mmplayer_gst_check_seekable(mmplayer_t *player)
 {
        GstQuery *query = NULL;
        gboolean seekable = FALSE;
@@ -2925,7 +3186,7 @@ __mmplayer_gst_check_seekable(mm_player_t *player)
 }
 
 int
-__mmplayer_gst_set_state(mm_player_t *player, GstElement *element,  GstState state, gboolean async, gint timeout)
+_mmplayer_gst_set_state(mmplayer_t *player, GstElement *element,  GstState state, gboolean async, gint timeout)
 {
        GstState element_state = GST_STATE_VOID_PENDING;
        GstState element_pending_state = GST_STATE_VOID_PENDING;
@@ -2944,7 +3205,7 @@ __mmplayer_gst_set_state(mm_player_t *player, GstElement *element,  GstState sta
                LOGE("failed to set [%s] state", GST_ELEMENT_NAME(element));
 
                /* dump state of all element */
-               __mmplayer_dump_pipeline_state(player);
+               _mmplayer_dump_pipeline_state(player);
 
                return MM_ERROR_PLAYER_INTERNAL;
        }
@@ -2968,7 +3229,7 @@ __mmplayer_gst_set_state(mm_player_t *player, GstElement *element,  GstState sta
                        gst_element_state_get_name(element_pending_state));
 
                /* dump state of all element */
-               __mmplayer_dump_pipeline_state(player);
+               _mmplayer_dump_pipeline_state(player);
 
                return MM_ERROR_PLAYER_INTERNAL;
        }
@@ -2981,7 +3242,7 @@ __mmplayer_gst_set_state(mm_player_t *player, GstElement *element,  GstState sta
 }
 
 int
-__mmplayer_gst_start(mm_player_t *player)
+_mmplayer_gst_start(mmplayer_t *player)
 {
        int ret = MM_ERROR_NONE;
        gboolean async = FALSE;
@@ -2996,7 +3257,7 @@ __mmplayer_gst_start(mm_player_t *player)
         */
        if (player->pending_seek.is_pending && !MMPLAYER_IS_STREAMING(player)) {
                MMPLAYER_TARGET_STATE(player) = MM_PLAYER_STATE_PAUSED;
-               ret = __mmplayer_gst_pause(player, FALSE);
+               ret = _mmplayer_gst_pause(player, FALSE);
                if (ret != MM_ERROR_NONE) {
                        LOGE("failed to set state to PAUSED for pending seek");
                        return ret;
@@ -3012,7 +3273,7 @@ __mmplayer_gst_start(mm_player_t *player)
        MMPLAYER_PRINT_STATE(player);
 
        /* set pipeline state to PLAYING  */
-       ret = __mmplayer_gst_set_state(player,
+       ret = _mmplayer_gst_set_state(player,
                player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_STATE_PLAYING, async, MMPLAYER_STATE_CHANGE_TIMEOUT(player));
        if (ret != MM_ERROR_NONE) {
                LOGE("failed to set state to PLAYING");
@@ -3030,7 +3291,7 @@ __mmplayer_gst_start(mm_player_t *player)
 }
 
 int
-__mmplayer_gst_stop(mm_player_t *player)
+_mmplayer_gst_stop(mmplayer_t *player)
 {
        GstStateChangeReturn change_ret = GST_STATE_CHANGE_SUCCESS;
        MMHandleType attrs = 0;
@@ -3065,7 +3326,7 @@ __mmplayer_gst_stop(mm_player_t *player)
                __mmplayer_gst_set_async(player, FALSE, MMPLAYER_SINK_ALL);
 
        /* set gst state */
-       ret = __mmplayer_gst_set_state(player, player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_STATE_PAUSED, FALSE, timeout);
+       ret = _mmplayer_gst_set_state(player, player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_STATE_PAUSED, FALSE, timeout);
 
        if (player->es_player_push_mode) {
                /* enable the async state transition as default operation */
@@ -3080,7 +3341,7 @@ __mmplayer_gst_stop(mm_player_t *player)
 
        /* rewind */
        if (rewind) {
-               if (!__mmplayer_gst_seek(player, player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, player->playback_rate,
+               if (!_mmplayer_gst_seek(player, player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, player->playback_rate,
                                GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, 0,
                                GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
                        LOGW("failed to rewind");
@@ -3101,7 +3362,7 @@ __mmplayer_gst_stop(mm_player_t *player)
        } else {
                LOGE("fail to stop player.");
                ret = MM_ERROR_PLAYER_INTERNAL;
-               __mmplayer_dump_pipeline_state(player);
+               _mmplayer_dump_pipeline_state(player);
        }
 
        /* generate dot file if enabled */
@@ -3113,7 +3374,7 @@ __mmplayer_gst_stop(mm_player_t *player)
 }
 
 int
-__mmplayer_gst_pause(mm_player_t *player, gboolean async)
+_mmplayer_gst_pause(mmplayer_t *player, gboolean async)
 {
        int ret = MM_ERROR_NONE;
 
@@ -3127,7 +3388,7 @@ __mmplayer_gst_pause(mm_player_t *player, gboolean async)
        MMPLAYER_PRINT_STATE(player);
 
        /* set pipeline status to PAUSED */
-       ret = __mmplayer_gst_set_state(player,
+       ret = _mmplayer_gst_set_state(player,
                player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_STATE_PAUSED, async, MMPLAYER_STATE_CHANGE_TIMEOUT(player));
 
        if (async)
@@ -3197,9 +3458,11 @@ __mmplayer_gst_pause(mm_player_t *player, gboolean async)
                return ret;
        }
 
-       if ((!MMPLAYER_IS_RTSP_STREAMING(player)) && (!player->video_stream_cb) &&
-               (!player->pipeline->videobin) && (!player->pipeline->audiobin))
-               return MM_ERROR_PLAYER_CODEC_NOT_FOUND;
+       if (!MMPLAYER_USE_URIDECODEBIN3(player)) {
+               if ((!MMPLAYER_IS_RTSP_STREAMING(player)) && (!player->video_decoded_cb) &&
+                       (!player->pipeline->videobin) && (!player->pipeline->audiobin))
+                       return MM_ERROR_PLAYER_CODEC_NOT_FOUND;
+       }
 
        MMPLAYER_SET_STATE(player, MM_PLAYER_STATE_PAUSED);
 
@@ -3213,7 +3476,7 @@ EXIT:
 }
 
 int
-__mmplayer_gst_resume(mm_player_t *player, gboolean async)
+_mmplayer_gst_resume(mmplayer_t *player, gboolean async)
 {
        int ret = MM_ERROR_NONE;
        gint timeout = 0;
@@ -3233,7 +3496,7 @@ __mmplayer_gst_resume(mm_player_t *player, gboolean async)
        /* set pipeline state to PLAYING */
        timeout = MMPLAYER_STATE_CHANGE_TIMEOUT(player);
 
-       ret = __mmplayer_gst_set_state(player,
+       ret = _mmplayer_gst_set_state(player,
                player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_STATE_PLAYING, async, timeout);
        if (ret != MM_ERROR_NONE) {
                LOGE("failed to set state to PLAYING");
@@ -3254,7 +3517,7 @@ EXIT:
 
 /* sending event to one of sinkelements */
 gboolean
-__mmplayer_gst_send_event_to_sink(mm_player_t *player, GstEvent *event)
+_mmplayer_gst_send_event_to_sink(mmplayer_t *player, GstEvent *event)
 {
        GstEvent *event2 = NULL;
        GList *sinks = NULL;
@@ -3344,7 +3607,7 @@ __mmplayer_gst_send_event_to_sink(mm_player_t *player, GstEvent *event)
 }
 
 gboolean
-__mmplayer_gst_seek(mm_player_t *player, GstElement *element, gdouble rate,
+_mmplayer_gst_seek(mmplayer_t *player, GstElement *element, gdouble rate,
                        GstFormat format, GstSeekFlags flags, GstSeekType cur_type,
                        gint64 cur, GstSeekType stop_type, gint64 stop)
 {
@@ -3361,7 +3624,7 @@ __mmplayer_gst_seek(mm_player_t *player, GstElement *element, gdouble rate,
        event = gst_event_new_seek(rate, format, flags, cur_type,
                cur, stop_type, stop);
 
-       result = __mmplayer_gst_send_event_to_sink(player, event);
+       result = _mmplayer_gst_send_event_to_sink(player, event);
 
        MMPLAYER_FLEAVE();
 
@@ -3369,7 +3632,7 @@ __mmplayer_gst_seek(mm_player_t *player, GstElement *element, gdouble rate,
 }
 
 int
-__mmplayer_gst_set_position(mm_player_t *player, gint64 position, gboolean internal_called)
+_mmplayer_gst_set_position(mmplayer_t *player, gint64 position, gboolean internal_called)
 {
        int ret = MM_ERROR_NONE;
        gint64 pos_nsec = 0;
@@ -3401,7 +3664,7 @@ __mmplayer_gst_set_position(mm_player_t *player, gint64 position, gboolean inter
           This causes problem is position calculation during normal pause resume scenarios also.
           Currently during seek , we are sending the current position to rtspsrc module for position saving for later use. */
        if ((MMPLAYER_IS_RTSP_STREAMING(player)) &&
-               (__mmplayer_get_stream_service_type(player) == STREAMING_SERVICE_VOD)) {
+               (_mmplayer_get_stream_service_type(player) == STREAMING_SERVICE_VOD)) {
                if (!gst_element_query_position(player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_FORMAT_TIME, &pos_nsec))
                        LOGW("getting current position failed in seek");
 
@@ -3437,7 +3700,7 @@ __mmplayer_gst_set_position(mm_player_t *player, gint64 position, gboolean inter
                else
                        seek_flags |= GST_SEEK_FLAG_KEY_UNIT;
 
-               if (!__mmplayer_gst_seek(player, player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, player->playback_rate,
+               if (!_mmplayer_gst_seek(player, player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, player->playback_rate,
                                                GST_FORMAT_TIME, seek_flags,
                                                GST_SEEK_TYPE_SET, position, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
                        LOGE("failed to set position");
@@ -3480,11 +3743,11 @@ SEEK_ERROR:
 }
 
 int
-__mmplayer_gst_get_position(mm_player_t *player, gint64 *position)
+_mmplayer_gst_get_position(mmplayer_t *player, gint64 *position)
 {
 #define TRICKPLAY_OFFSET GST_MSECOND
 
-       MMPlayerStateType current_state = MM_PLAYER_STATE_NONE;
+       mmplayer_state_e current_state = MM_PLAYER_STATE_NONE;
        gint64 pos_nsec = 0;
        gboolean ret = TRUE;
 
@@ -3531,14 +3794,14 @@ __mmplayer_gst_get_position(mm_player_t *player, gint64 *position)
 }
 
 int
-__mmplayer_gst_get_buffer_position(mm_player_t *player, int *start_pos, int *end_pos)
+_mmplayer_gst_get_buffer_position(mmplayer_t *player, int *start_pos, int *end_pos)
 {
 #define STREAMING_IS_FINISHED  0
 #define BUFFERING_MAX_PER      100
 #define DEFAULT_PER_VALUE      -1
 #define CHECK_PERCENT_VALUE(a, min, max)(((a) > (min)) ? (((a) < (max)) ? (a) : (max)) : (min))
 
-       MMPlayerGstElement *mainbin = NULL;
+       mmplayer_gst_element_t *mainbin = NULL;
        gint start_per = DEFAULT_PER_VALUE, end_per = DEFAULT_PER_VALUE;
        gint64 buffered_total = 0;
        gint64 position = 0;
@@ -3568,7 +3831,7 @@ __mmplayer_gst_get_buffer_position(mm_player_t *player, int *start_pos, int *end
                return MM_ERROR_NONE;
        }
 
-       if (__mmplayer_gst_get_position(player, &position) != MM_ERROR_NONE) {
+       if (_mmplayer_gst_get_position(player, &position) != MM_ERROR_NONE) {
                LOGW("fail to get current position");
                return MM_ERROR_NONE;
        }
@@ -3661,7 +3924,7 @@ __mmplayer_gst_get_buffer_position(mm_player_t *player, int *start_pos, int *end
 }
 
 GstElement *
-__mmplayer_gst_create_source(mm_player_t *player)
+_mmplayer_gst_create_source(mmplayer_t *player)
 {
        GstElement *element = NULL;
 
@@ -3693,34 +3956,26 @@ __mmplayer_gst_create_source(mm_player_t *player)
 }
 
 int
-__mmplayer_gst_build_es_pipeline(mm_player_t *player)
+_mmplayer_gst_build_es_pipeline(mmplayer_t *player)
 {
-       MMHandleType attrs = 0;
-
        MMPLAYER_FENTER();
        MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline &&
                                player->pipeline->mainbin, MM_ERROR_PLAYER_NOT_INITIALIZED);
 
-       /* get profile attribute */
-       attrs = MMPLAYER_GET_ATTRS(player);
-       if (!attrs) {
-               LOGE("failed to get content attribute");
-               return MM_ERROR_PLAYER_INTERNAL;
-       }
-
        SECURE_LOGD("uri : %s", player->profile.uri);
 
-       mm_attrs_set_int_by_name(attrs, "profile_prepare_async", TRUE);
-       if (mm_attrs_commit_all(attrs)) /* return -1 if error */
-               LOGE("failed to commit");
+       mm_player_set_attribute((MMHandleType)player, NULL, "profile_prepare_async", TRUE, NULL);
 
-       if (player->v_stream_caps && !__mmplayer_gst_create_es_path(player, MM_PLAYER_STREAM_TYPE_VIDEO, player->v_stream_caps))
+       if ((player->v_stream_caps) &&
+               !(__mmplayer_gst_create_es_path(player, MM_PLAYER_STREAM_TYPE_VIDEO, player->v_stream_caps)))
                return MM_ERROR_PLAYER_INTERNAL;
 
-       if (player->a_stream_caps && !__mmplayer_gst_create_es_path(player, MM_PLAYER_STREAM_TYPE_AUDIO, player->a_stream_caps))
+       if ((player->a_stream_caps) &&
+               !(__mmplayer_gst_create_es_path(player, MM_PLAYER_STREAM_TYPE_AUDIO, player->a_stream_caps)))
                return MM_ERROR_PLAYER_INTERNAL;
 
-       if (player->s_stream_caps && !__mmplayer_gst_create_es_path(player, MM_PLAYER_STREAM_TYPE_TEXT, player->s_stream_caps))
+       if ((player->s_stream_caps) &&
+               !(__mmplayer_gst_create_es_path(player, MM_PLAYER_STREAM_TYPE_TEXT, player->s_stream_caps)))
                return MM_ERROR_PLAYER_INTERNAL;
 
        MMPLAYER_FLEAVE();
@@ -3728,25 +3983,19 @@ __mmplayer_gst_build_es_pipeline(mm_player_t *player)
 }
 
 int
-__mmplayer_gst_build_pipeline(mm_player_t *player)
+_mmplayer_gst_build_pipeline(mmplayer_t *player)
 {
-       MMPlayerGstElement *mainbin = NULL;
+       mmplayer_gst_element_t *mainbin = NULL;
        GstElement *src_elem = NULL;
        GstElement *autoplug_elem = NULL;
        GList *element_bucket = NULL;
-       MMHandleType attrs = 0;
-       enum MainElementID autoplug_elem_id = MMPLAYER_M_NUM;
+       main_element_id_e autoplug_elem_id = MMPLAYER_M_NUM;
 
        MMPLAYER_FENTER();
        MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline &&
                                player->pipeline->mainbin, MM_ERROR_PLAYER_NOT_INITIALIZED);
 
-       /* get profile attribute */
-       attrs = MMPLAYER_GET_ATTRS(player);
-       if (!attrs) {
-               LOGE("failed to get content attribute");
-               return MM_ERROR_PLAYER_INTERNAL;
-       }
+       mainbin = player->pipeline->mainbin;
 
        LOGD("uri type %d", player->profile.uri_type);
 
@@ -3756,6 +4005,10 @@ __mmplayer_gst_build_pipeline(mm_player_t *player)
                src_elem = __mmplayer_gst_make_rtsp_src(player);
                break;
        case MM_PLAYER_URI_TYPE_URL_HTTP:
+               if (player->ini.use_uridecodebin3) { /* or MMPLAYER_USE_URIDECODEBIN3(player) */
+                       LOGD("uridecodebin include src element.");
+                       goto ADD_DECODEBIN;
+               }
                src_elem = __mmplayer_gst_make_http_src(player);
                break;
        case MM_PLAYER_URI_TYPE_FILE:
@@ -3792,9 +4045,9 @@ __mmplayer_gst_build_pipeline(mm_player_t *player)
                        g_object_set(src_elem, "stream-type", stream_type,
                                "size", (gint64)player->profile.input_mem.len, "blocksize", 20480, NULL);
 
-                       __mmplayer_add_signal_connection(player, G_OBJECT(src_elem), MM_PLAYER_SIGNAL_TYPE_OTHERS, "seek-data",
+                       _mmplayer_add_signal_connection(player, G_OBJECT(src_elem), MM_PLAYER_SIGNAL_TYPE_OTHERS, "seek-data",
                                                                                        G_CALLBACK(__mmplayer_gst_appsrc_seek_data_mem), (gpointer)&player->profile.input_mem);
-                       __mmplayer_add_signal_connection(player, G_OBJECT(src_elem), MM_PLAYER_SIGNAL_TYPE_OTHERS, "need-data",
+                       _mmplayer_add_signal_connection(player, G_OBJECT(src_elem), MM_PLAYER_SIGNAL_TYPE_OTHERS, "need-data",
                                                                                        G_CALLBACK(__mmplayer_gst_appsrc_feed_data_mem), (gpointer)&player->profile.input_mem);
                }
                break;
@@ -3808,8 +4061,6 @@ __mmplayer_gst_build_pipeline(mm_player_t *player)
                return MM_ERROR_PLAYER_INTERNAL;
        }
 
-       mainbin = player->pipeline->mainbin;
-
        /* take source element */
        LOGD("source elem is created %s", GST_ELEMENT_NAME(src_elem));
 
@@ -3817,20 +4068,28 @@ __mmplayer_gst_build_pipeline(mm_player_t *player)
        mainbin[MMPLAYER_M_SRC].gst = src_elem;
        element_bucket = g_list_append(element_bucket, &mainbin[MMPLAYER_M_SRC]);
 
-       /* create next element for auto-plugging */
+ADD_DECODEBIN: /* create next element for auto-plugging */
        if (MMPLAYER_IS_HTTP_STREAMING(player)) {
-               autoplug_elem_id = MMPLAYER_M_TYPEFIND;
-               autoplug_elem = gst_element_factory_make("typefind", "typefinder");
-               if (!autoplug_elem) {
-                       LOGE("failed to create typefind element");
-                       goto ERROR;
+               if (!src_elem) { /* make uridecodebin3 which include src element */
+                       autoplug_elem_id = MMPLAYER_M_AUTOPLUG;
+                       autoplug_elem = __mmplayer_gst_make_uridecodebin(player);
+                       if (!autoplug_elem) {
+                               LOGE("failed to create uridecodebin3 element");
+                               goto ERROR;
+                       }
+               } else {
+                       autoplug_elem_id = MMPLAYER_M_TYPEFIND;
+                       autoplug_elem = gst_element_factory_make("typefind", "typefinder");
+                       if (!autoplug_elem) {
+                               LOGE("failed to create typefind element");
+                               goto ERROR;
+                       }
+                       _mmplayer_add_signal_connection(player, G_OBJECT(autoplug_elem), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "have-type",
+                                                                               G_CALLBACK(_mmplayer_typefind_have_type), (gpointer)player);
                }
-
-               __mmplayer_add_signal_connection(player, G_OBJECT(autoplug_elem), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "have-type",
-                                                                       G_CALLBACK(__mmplayer_typefind_have_type), (gpointer)player);
        } else if (!MMPLAYER_IS_RTSP_STREAMING(player)) {
                autoplug_elem_id = MMPLAYER_M_AUTOPLUG;
-               autoplug_elem = __mmplayer_gst_make_decodebin(player);
+               autoplug_elem = _mmplayer_gst_make_decodebin(player);
                if (!autoplug_elem) {
                        LOGE("failed to create decodebin");
                        goto ERROR;
@@ -3850,19 +4109,20 @@ __mmplayer_gst_build_pipeline(mm_player_t *player)
        }
 
        /* add elements to pipeline */
-       if (!__mmplayer_gst_element_add_bucket_to_bin(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), element_bucket)) {
+       if (!_mmplayer_gst_element_add_bucket_to_bin(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), element_bucket)) {
                LOGE("failed to add elements to pipeline");
                goto ERROR;
        }
 
        /* linking elements in the bucket by added order. */
-       if (__mmplayer_gst_element_link_bucket(element_bucket) == -1) {
+       if (_mmplayer_gst_element_link_bucket(element_bucket) == -1) {
                LOGE("failed to link some elements");
                goto ERROR;
        }
 
        /* FIXME: need to check whether this is required or not. */
-       if (MMPLAYER_IS_HTTP_STREAMING(player) || MMPLAYER_IS_RTSP_STREAMING(player)) {
+       if (MMPLAYER_IS_HTTP_STREAMING(player) || MMPLAYER_IS_RTSP_STREAMING(player) ||
+               (player->audio_extract_opt & MM_PLAYER_AUDIO_EXTRACT_DEINTERLEAVE)) {
                /* create fakesink element for keeping the pipeline state PAUSED. if needed */
                mainbin[MMPLAYER_M_SRC_FAKESINK].id = MMPLAYER_M_SRC_FAKESINK;
                mainbin[MMPLAYER_M_SRC_FAKESINK].gst = gst_element_factory_make("fakesink", "state-holder");
@@ -3908,10 +4168,10 @@ ERROR:
 }
 
 int
-__mmplayer_gst_add_bus_watch(mm_player_t *player)
+_mmplayer_gst_add_bus_watch(mmplayer_t *player)
 {
        GstBus  *bus = NULL;
-       MMPlayerGstElement *mainbin = NULL;
+       mmplayer_gst_element_t *mainbin = NULL;
 
        MMPLAYER_FENTER();
        MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline &&
@@ -3954,3 +4214,132 @@ __mmplayer_gst_add_bus_watch(mm_player_t *player)
        MMPLAYER_FLEAVE();
        return MM_ERROR_NONE;
 }
+
+void
+_mmplayer_activate_next_source(mmplayer_t *player, GstState target)
+{
+       mmplayer_gst_element_t *mainbin = NULL;
+       MMMessageParamType msg_param = {0,};
+       GstElement *element = NULL;
+       MMHandleType attrs = 0;
+       char *uri = NULL;
+       main_element_id_e elem_idx = MMPLAYER_M_NUM;
+
+       MMPLAYER_FENTER();
+
+       if (!player || !player->pipeline || !player->pipeline->mainbin) {
+               LOGE("player is not initialized");
+               goto ERROR;
+       }
+
+       mainbin = player->pipeline->mainbin;
+       msg_param.code = MM_ERROR_PLAYER_INTERNAL;
+
+       attrs = MMPLAYER_GET_ATTRS(player);
+       if (!attrs) {
+               LOGE("fail to get attributes");
+               goto ERROR;
+       }
+
+       mm_attrs_get_string_by_name(attrs, "profile_uri", &uri);
+
+       if (_mmplayer_parse_profile((const char *)uri, NULL, &player->profile) != MM_ERROR_NONE) {
+               LOGE("failed to parse profile");
+               msg_param.code = MM_ERROR_PLAYER_INVALID_URI;
+               goto ERROR;
+       }
+
+       if ((MMPLAYER_URL_HAS_DASH_SUFFIX(player)) ||
+               (MMPLAYER_URL_HAS_HLS_SUFFIX(player))) {
+               LOGE("dash or hls is not supportable");
+               msg_param.code = MM_ERROR_PLAYER_INVALID_URI;
+               goto ERROR;
+       }
+
+       element = _mmplayer_gst_create_source(player);
+       if (!element) {
+               LOGE("no source element was created");
+               goto ERROR;
+       }
+
+       if (gst_bin_add(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), element) == FALSE) {
+               LOGE("failed to add source element to pipeline");
+               gst_object_unref(GST_OBJECT(element));
+               element = NULL;
+               goto ERROR;
+       }
+
+       /* take source element */
+       mainbin[MMPLAYER_M_SRC].id = MMPLAYER_M_SRC;
+       mainbin[MMPLAYER_M_SRC].gst = element;
+
+       element = NULL;
+
+       if (MMPLAYER_IS_HTTP_STREAMING(player)) {
+               if (player->streamer == NULL) {
+                       player->streamer = _mm_player_streaming_create();
+                       _mm_player_streaming_initialize(player->streamer, TRUE);
+               }
+
+               elem_idx = MMPLAYER_M_TYPEFIND;
+               element = gst_element_factory_make("typefind", "typefinder");
+               _mmplayer_add_signal_connection(player, G_OBJECT(element),
+                       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "have-type", G_CALLBACK(_mmplayer_typefind_have_type), (gpointer)player);
+       } else {
+               elem_idx = MMPLAYER_M_AUTOPLUG;
+               element = _mmplayer_gst_make_decodebin(player);
+       }
+
+       /* check autoplug element is OK */
+       if (!element) {
+               LOGE("can not create element(%d)", elem_idx);
+               goto ERROR;
+       }
+
+       if (gst_bin_add(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), element) == FALSE) {
+               LOGE("failed to add sinkbin to pipeline");
+               gst_object_unref(GST_OBJECT(element));
+               element = NULL;
+               goto ERROR;
+       }
+
+       mainbin[elem_idx].id = elem_idx;
+       mainbin[elem_idx].gst = element;
+
+       if (gst_element_link(mainbin[MMPLAYER_M_SRC].gst, mainbin[elem_idx].gst) == FALSE) {
+               LOGE("Failed to link src - autoplug(or typefind)");
+               goto ERROR;
+       }
+
+       if (!MMPLAYER_IS_HTTP_STREAMING(player)) {
+               if (gst_element_set_state(mainbin[MMPLAYER_M_AUTOPLUG].gst, target) == GST_STATE_CHANGE_FAILURE) {
+                       LOGE("Failed to change state of decodebin");
+                       goto ERROR;
+               }
+       } else {
+               if (gst_element_set_state(mainbin[MMPLAYER_M_TYPEFIND].gst, target) == GST_STATE_CHANGE_FAILURE) {
+                       LOGE("Failed to change state of src element");
+                       goto ERROR;
+               }
+       }
+
+       if (gst_element_set_state(mainbin[MMPLAYER_M_SRC].gst, target) == GST_STATE_CHANGE_FAILURE) {
+               LOGE("Failed to change state of src element");
+               goto ERROR;
+       }
+
+       player->gapless.stream_changed = TRUE;
+       player->gapless.running = TRUE;
+       MMPLAYER_FLEAVE();
+       return;
+
+ERROR:
+       if (player) {
+               _mmplayer_set_reconfigure_state(player, FALSE);
+               if (!player->msg_posted) {
+                       MMPLAYER_POST_MSG(player, MM_MESSAGE_ERROR, &msg_param);
+                       player->msg_posted = TRUE;
+               }
+       }
+       return;
+}