[1.0.2] fix wrong condition
[platform/core/multimedia/libmm-player.git] / src / mm_player_gst.c
index b2dd971..234170c 100644 (file)
 ========================================================================================== */
 
 /*---------------------------------------------------------------------------
-|    GLOBAL CONSTANT DEFINITIONS:                                                                                      |
----------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
-|    IMPORTED VARIABLE DECLARATIONS:                                                                           |
----------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
-|    IMPORTED FUNCTION DECLARATIONS:                                                                           |
----------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
-|    LOCAL #defines:                                                                                                           |
----------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
 |    LOCAL CONSTANT DEFINITIONS:                                                                                       |
 ---------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
-|    LOCAL DATA TYPE DEFINITIONS:                                                                                      |
----------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
-|    GLOBAL VARIABLE DEFINITIONS:                                                                                      |
----------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
-|    LOCAL VARIABLE DEFINITIONS:                                                                                       |
----------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------
-|    LOCAL FUNCTION PROTOTYPES:                                                                                                |
----------------------------------------------------------------------------*/
+#define MMPLAYER_TAG_INDENT 3
 
 /*===========================================================================================
 |                                                                                                                                                                                      |
 |  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(mmplayer_t *player, gchar *src_element_name)
 {
        /* check whether the error is posted from not-activated track or not */
        int msg_src_pos = 0;
-       gint active_pad_index = 0;
+       gint active_index = 0;
 
        MMPLAYER_RETURN_VAL_IF_FAIL(player->pipeline->mainbin[MMPLAYER_M_A_INPUT_SELECTOR].gst, TRUE);
 
-       active_pad_index = player->selector[MM_PLAYER_TRACK_TYPE_AUDIO].active_pad_index;
-       LOGD("current  active pad index  -%d", active_pad_index);
+       active_index = player->track[MM_PLAYER_TRACK_TYPE_AUDIO].active_track_index;
+       LOGD("current  active pad index  -%d", active_index);
 
        if  (src_element_name) {
                int idx = 0;
@@ -140,10 +80,10 @@ __mmplayer_check_error_posted_from_activated_track(mmplayer_t *player, gchar *sr
                                idx++;
                        }
                }
-               LOGD("active pad = %d, error src index = %d", active_pad_index,  msg_src_pos);
+               LOGD("active pad = %d, error src index = %d", active_index,  msg_src_pos);
        }
 
-       if (active_pad_index != msg_src_pos) {
+       if (active_index != msg_src_pos) {
                LOGD("skip error because error is posted from no activated track");
                return FALSE;
        }
@@ -243,9 +183,6 @@ __mmplayer_gst_transform_gsterror(mmplayer_t *player, GstMessage *message, GErro
                                                                player->pipeline->mainbin, MM_ERROR_PLAYER_NOT_INITIALIZED);
 
        src_element = GST_ELEMENT_CAST(message->src);
-       if (!src_element)
-               return MM_ERROR_PLAYER_INTERNAL;
-
        src_element_name = GST_ELEMENT_NAME(src_element);
        if (!src_element_name)
                return MM_ERROR_PLAYER_INTERNAL;
@@ -261,7 +198,8 @@ __mmplayer_gst_transform_gsterror(mmplayer_t *player, GstMessage *message, GErro
        LOGD("error code=%d, msg=%s, src element=%s, class=%s",
                        error->code, error->message, src_element_name, klass);
 
-       if (!__mmplayer_check_error_posted_from_activated_track(player, src_element_name))
+       if (MMPLAYER_USE_DECODEBIN(player) &&
+               !__mmplayer_check_error_posted_from_activated_track(player, src_element_name))
                return MM_ERROR_NONE;
 
        switch (error->code) {
@@ -362,17 +300,17 @@ __mmplayer_gst_handle_resource_error(mmplayer_t *player, int code, GstMessage *m
                break;
        case GST_RESOURCE_ERROR_NOT_FOUND:
        case GST_RESOURCE_ERROR_OPEN_READ:
-               if (MMPLAYER_IS_HTTP_STREAMING(player) || MMPLAYER_IS_HTTP_LIVE_STREAMING(player)
-                       || MMPLAYER_IS_RTSP_STREAMING(player)) {
+               if (MMPLAYER_IS_STREAMING(player)) {
                        trans_err = MM_ERROR_PLAYER_STREAMING_CONNECTION_FAIL;
                        break;
                }
        case GST_RESOURCE_ERROR_READ:
-               if (MMPLAYER_IS_HTTP_STREAMING(player) || MMPLAYER_IS_HTTP_LIVE_STREAMING(player)
-                       || MMPLAYER_IS_RTSP_STREAMING(player)) {
+               if (MMPLAYER_IS_STREAMING(player)) {
                        trans_err = MM_ERROR_PLAYER_STREAMING_FAIL;
                        break;
-               } else if (message != NULL && message->src != NULL) {
+               }
+
+               if (message != NULL && message->src != NULL) {
                        storage_state_e storage_state = STORAGE_STATE_UNMOUNTABLE;
                        mmplayer_path_type_e path_type = MMPLAYER_PATH_MAX;
 
@@ -457,7 +395,7 @@ __mmplayer_handle_gst_error(mmplayer_t *player, GstMessage *message, GError *err
        MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE);
        MMPLAYER_RETURN_VAL_IF_FAIL(error, FALSE);
 
-       /* NOTE : do somthing necessary inside of __gst_handle_XXX_error. not here */
+       /* NOTE : do something necessary inside of __gst_handle_XXX_error. not here */
 
        memset(&msg_param, 0, sizeof(MMMessageParamType));
 
@@ -481,7 +419,7 @@ __mmplayer_handle_gst_error(mmplayer_t *player, GstMessage *message, GError *err
 
                msg_param.data = (void *)error->message;
 
-               LOGE("-Msg src : [%s]   Domain : [%s]   Error : [%s]  Code : [%d] is tranlated to error code : [0x%x]",
+               LOGE("-Msg src : [%s]   Domain : [%s]   Error : [%s]  Code : [%d] is translated to error code : [0x%x]",
                        msg_src_element, g_quark_to_string(error->domain), error->message, error->code, msg_param.code);
        }
 
@@ -517,27 +455,19 @@ __mmplayer_handle_gst_error(mmplayer_t *player, GstMessage *message, GError *err
 }
 
 static gboolean
-__mmplayer_handle_streaming_error(mmplayer_t *player, GstMessage *message)
+__mmplayer_handle_streaming_error(mmplayer_t *player, GstMessage *message, GError *error)
 {
        LOGD("\n");
-       MMMessageParamType msg_param;
+       MMMessageParamType msg_param = {0, };
        gchar *msg_src_element = NULL;
-       GstStructure *s = NULL;
-       guint error_id = 0;
-       gchar *error_string = NULL;
 
        MMPLAYER_FENTER();
 
        MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE);
        MMPLAYER_RETURN_VAL_IF_FAIL(message, FALSE);
+       MMPLAYER_RETURN_VAL_IF_FAIL(error, FALSE);
 
-       s = gst_structure_copy(gst_message_get_structure(message));
-
-
-       if (!gst_structure_get_uint(s, "error_id", &error_id))
-               error_id = MMPLAYER_STREAMING_ERROR_NONE;
-
-       switch (error_id) {
+       switch (error->code) {
        case MMPLAYER_STREAMING_ERROR_UNSUPPORTED_AUDIO:
                msg_param.code = MM_ERROR_PLAYER_STREAMING_UNSUPPORTED_AUDIO;
                break;
@@ -675,14 +605,12 @@ __mmplayer_handle_streaming_error(mmplayer_t *player, GstMessage *message)
                break;
        default:
                {
-                       gst_structure_free(s);
                        return MM_ERROR_PLAYER_STREAMING_FAIL;
                }
        }
 
-       error_string = g_strdup(gst_structure_get_string(s, "error_string"));
-       if (error_string)
-               msg_param.data = (void *)error_string;
+       if (error->message)
+               msg_param.data = (void *)(error->message);
 
        if (message->src) {
                msg_src_element = GST_ELEMENT_NAME(GST_ELEMENT_CAST(message->src));
@@ -701,9 +629,6 @@ __mmplayer_handle_streaming_error(mmplayer_t *player, GstMessage *message)
                LOGD("skip error post because it's sent already.");
        }
 
-       gst_structure_free(s);
-       MMPLAYER_FREEIF(error_string);
-
        MMPLAYER_FLEAVE();
        return TRUE;
 
@@ -776,7 +701,7 @@ __mmplayer_gst_extract_tag_from_msg(mmplayer_t *player, GstMessage *msg)
                        if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) {\
                                LOGD("failed to get image data from tag");\
                                gst_sample_unref(sample);\
-                               return FALSE;\
+                               break;\
                        } \
                        SECURE_LOGD("update album cover data : %p, size : %zu", info.data, info.size);\
                        MMPLAYER_FREEIF(player->album_art);\
@@ -841,6 +766,11 @@ __mmplayer_gst_extract_tag_from_msg(mmplayer_t *player, GstMessage *msg)
                if (gst_tag_list_get_date(tag_list, gsttag, &date)) {\
                        if (date != NULL) {\
                                string = g_strdup_printf("%d", g_date_get_year(date));\
+                               if (string == NULL) {\
+                                       LOGD("failed to get date/time from tag");\
+                                       g_date_free(date);\
+                                       break;\
+                               } \
                                mm_player_set_attribute((MMHandleType)player, NULL,\
                                                playertag, string, strlen(string), NULL); \
                                SECURE_LOGD("metainfo year : %s", string);\
@@ -855,6 +785,11 @@ __mmplayer_gst_extract_tag_from_msg(mmplayer_t *player, GstMessage *msg)
                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));\
+                               if (string == NULL) {\
+                                       LOGD("failed to get year from tag");\
+                                       gst_date_time_unref(datetime);\
+                                       break;\
+                               } \
                                mm_player_set_attribute((MMHandleType)player, NULL,\
                                                playertag, string, strlen(string), NULL); \
                                SECURE_LOGD("metainfo year : %s", string);\
@@ -947,7 +882,24 @@ __mmplayer_gst_extract_tag_from_msg(mmplayer_t *player, GstMessage *msg)
        return TRUE;
 }
 
-/* if retval is FALSE, it will be dropped for perfomance. */
+
+static mmplayer_track_type_e
+__mmplayer_convert_gst_stream_type_to_track_type (GstStreamType stype)
+{
+       switch (stype) {
+       case GST_STREAM_TYPE_AUDIO:
+               return MM_PLAYER_TRACK_TYPE_AUDIO;
+       case GST_STREAM_TYPE_VIDEO:
+               return MM_PLAYER_TRACK_TYPE_VIDEO;
+       case GST_STREAM_TYPE_TEXT:
+               return MM_PLAYER_TRACK_TYPE_TEXT;
+       default:
+               LOGD("not supported stream stype");
+               return MM_PLAYER_TRACK_TYPE_MAX;
+       }
+}
+
+/* if retval is FALSE, it will be dropped for performance. */
 static gboolean
 __mmplayer_gst_check_useful_message(mmplayer_t *player, GstMessage *message)
 {
@@ -968,15 +920,18 @@ __mmplayer_gst_check_useful_message(mmplayer_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:
        case GST_MESSAGE_STATE_CHANGED:
                /* we only handle messages from pipeline */
+               MMPLAYER_RECONFIGURE_LOCK(player);
                if ((message->src == (GstObject *)player->pipeline->mainbin[MMPLAYER_M_PIPE].gst) && (!player->gapless.reconfigure))
                        retval = TRUE;
                else
                        retval = FALSE;
+               MMPLAYER_RECONFIGURE_UNLOCK(player);
                break;
        case GST_MESSAGE_BUFFERING:
        {
@@ -1003,6 +958,37 @@ __mmplayer_gst_check_useful_message(mmplayer_t *player, GstMessage *message)
 
                break;
        }
+       case GST_MESSAGE_STREAMS_SELECTED:
+       {
+               if (MMPLAYER_USE_DECODEBIN(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_set_reconfigure_state(player, FALSE);
+               if (!MMPLAYER_IS_ADAPTIVE_STREAMING(player))
+                       _mmplayer_pipeline_complete(NULL, player);
+               retval = TRUE;
+               break;
+       }
        default:
                retval = FALSE;
                break;
@@ -1021,14 +1007,22 @@ __mmplayer_update_buffer_setting(mmplayer_t *player, GstMessage *buffering_msg)
 
        _mmplayer_gst_get_position(player, &pos_nsec);  /* to update player->last_position */
 
-       if (MMPLAYER_IS_HTTP_STREAMING(player)) {
+       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);
+       if (!player->streamer->is_adaptive_streaming) {
+               _mm_player_streaming_sync_property(player->streamer, player->pipeline->mainbin[MMPLAYER_M_AUTOPLUG].gst);
+               return;
+       }
 
-       return;
+       /* adaptivedemux2 is used for buffering in uridecodebin3 */
+       if (!player->streamer->buffering_req.is_pre_buffering) {
+               LOGD("adaptive> set rebuffer time : %d ms", player->streamer->buffering_req.rebuffer_time);
+               g_object_set(player->pipeline->mainbin[MMPLAYER_M_ADAPTIVE_DEMUX].gst,
+                       "low-watermark-time", (guint64)(player->streamer->buffering_req.rebuffer_time * GST_MSECOND),
+                       NULL);
+       }
 }
 
 static int
@@ -1297,7 +1291,7 @@ __mmplayer_gst_pending_seek(mmplayer_t *player)
 
        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.");
+               LOGE("failed to seek pending position. just keep staying current position.");
 
        player->pending_seek.is_pending = false;
 
@@ -1374,7 +1368,7 @@ __mmplayer_gst_handle_eos_message(mmplayer_t *player, GstMessage *msg)
 
        MMPLAYER_FENTER();
 
-       /* NOTE : EOS event is comming multiple time. watch out it */
+       /* NOTE : EOS event is coming multiple time. watch out it */
        /* check state. we only process EOS when pipeline state goes to PLAYING */
        if (!(player->cmd == MMPLAYER_COMMAND_START || player->cmd == MMPLAYER_COMMAND_RESUME)) {
                LOGD("EOS received on non-playing state. ignoring it");
@@ -1443,12 +1437,12 @@ __mmplayer_gst_handle_error_message(mmplayer_t *player, GstMessage *msg)
                /* Note : the streaming error from the streaming source is handled
                 *       using __mmplayer_handle_streaming_error.
                 */
-               __mmplayer_handle_streaming_error(player, msg);
+               __mmplayer_handle_streaming_error(player, msg, error);
 
                /* dump state of all element */
                _mmplayer_dump_pipeline_state(player);
        } else {
-               /* traslate gst error code to msl error code. then post it
+               /* translate gst error code to msl error code. then post it
                 * to application if needed
                 */
                __mmplayer_handle_gst_error(player, msg, error);
@@ -1547,8 +1541,8 @@ __mmplayer_gst_handle_buffering_message(mmplayer_t *player, GstMessage *msg)
                                        player->seek_state = MMPLAYER_SEEK_NONE;
                                        MMPLAYER_POST_MSG(player, MM_MESSAGE_SEEK_COMPLETED, NULL);
                                } else if (MMPLAYER_TARGET_STATE(player) == MM_PLAYER_STATE_PLAYING) {
-                                       /* Considering the async state trasition in case of RTSP.
-                                          After getting state change gst msg, seek cmpleted msg will be posted. */
+                                       /* Considering the async state transition in case of RTSP.
+                                          After getting state change gst msg, seek completed msg will be posted. */
                                        player->seek_state = MMPLAYER_SEEK_COMPLETED;
                                }
                        }
@@ -1587,7 +1581,6 @@ static void
 __mmplayer_gst_handle_state_message(mmplayer_t *player, GstMessage *msg)
 {
        mmplayer_gst_element_t *mainbin;
-       const GValue *voldstate, *vnewstate, *vpending;
        GstState oldstate = GST_STATE_NULL;
        GstState newstate = GST_STATE_NULL;
        GstState pending = GST_STATE_NULL;
@@ -1601,20 +1594,7 @@ __mmplayer_gst_handle_state_message(mmplayer_t *player, GstMessage *msg)
        if (msg->src != (GstObject *)mainbin[MMPLAYER_M_PIPE].gst)
                return;
 
-       /* get state info from msg */
-       voldstate = gst_structure_get_value(gst_message_get_structure(msg), "old-state");
-       vnewstate = gst_structure_get_value(gst_message_get_structure(msg), "new-state");
-       vpending = gst_structure_get_value(gst_message_get_structure(msg), "pending-state");
-
-       if (!voldstate || !vnewstate) {
-               LOGE("received msg has wrong format.");
-               return;
-       }
-
-       oldstate = (GstState)voldstate->data[0].v_int;
-       newstate = (GstState)vnewstate->data[0].v_int;
-       if (vpending)
-               pending = (GstState)vpending->data[0].v_int;
+       gst_message_parse_state_changed(msg, &oldstate, &newstate, &pending);
 
        LOGD("state changed [%s] : %s ---> %s     final : %s",
                GST_OBJECT_NAME(GST_MESSAGE_SRC(msg)),
@@ -1631,7 +1611,7 @@ __mmplayer_gst_handle_state_message(mmplayer_t *player, GstMessage *msg)
                        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.");
+                               LOGE("failed to seek pending position. just keep staying current position.");
 
                        player->pending_seek.is_pending = false;
                }
@@ -1674,7 +1654,7 @@ __mmplayer_gst_handle_state_message(mmplayer_t *player, GstMessage *msg)
                {
                        if (MMPLAYER_IS_STREAMING(player)) {
                                // managed prepare async case when buffering is completed
-                               // pending state should be reset otherwise, it's still playing even though it's resumed after bufferging.
+                               // pending state should be reset otherwise, it's still playing even though it's resumed after buffering.
                                if ((MMPLAYER_CURRENT_STATE(player) != MM_PLAYER_STATE_PLAYING) ||
                                        (MMPLAYER_PENDING_STATE(player) == MM_PLAYER_STATE_PLAYING))
                                        MMPLAYER_SET_STATE(player, MM_PLAYER_STATE_PLAYING);
@@ -1789,13 +1769,13 @@ __mmplayer_gst_handle_element_message(mmplayer_t *player, GstMessage *msg)
        }
 
        /* custom message for RTSP attribute :
-               RTSP case, buffer is not come from server before PLAYING state. However,we have to get attribute after PAUSE state chaged.
+               RTSP case, buffer is not come from server before PLAYING state. However,we have to get attribute after PAUSE state changed.
                sdp which has contents info is received when rtsp connection is opened.
                extract duration ,codec info , resolution from sdp and get it by GstMessage */
        if (!strcmp(structure_name, "rtspsrc_properties")) {
-               gchar *audio_codec = NULL;
-               gchar *video_codec = NULL;
-               gchar *video_frame_size = NULL;
+               g_autofree gchar *audio_codec = NULL;
+               g_autofree gchar *video_codec = NULL;
+               g_autofree gchar *video_frame_size = NULL;
 
                gst_structure_get(gst_message_get_structure(msg),
                                        "rtsp_duration", G_TYPE_UINT64, &player->duration, NULL);
@@ -1820,18 +1800,12 @@ __mmplayer_gst_handle_element_message(mmplayer_t *player, GstMessage *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));
-                               seperator++;
-
-                               mm_player_set_attribute((MMHandleType)player, NULL, MM_PLAYER_VIDEO_WIDTH,
-                                               atoi(video_width), MM_PLAYER_VIDEO_HEIGHT, atoi(seperator), NULL);
-                       }
+                       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);
                }
        }
 
@@ -1856,6 +1830,9 @@ __mmplayer_gst_handle_async_done_message(mmplayer_t *player, GstMessage *msg)
                return;
 
        if (player->seek_state == MMPLAYER_SEEK_IN_PROGRESS) {
+               if (player->is_external_subtitle_present)
+                       _mmplayer_sync_subtitle_pipeline(player);
+
                if (MMPLAYER_TARGET_STATE(player) == MM_PLAYER_STATE_PAUSED) {
                        player->seek_state = MMPLAYER_SEEK_NONE;
                        MMPLAYER_POST_MSG(player, MM_MESSAGE_SEEK_COMPLETED, NULL);
@@ -1903,6 +1880,61 @@ __mmplayer_gst_handle_async_done_message(mmplayer_t *player, GstMessage *msg)
        return;
 }
 
+#ifdef __DEBUG__
+static void
+__mmplayer_print_tag_foreach(const GstTagList *tags, const gchar *tag, gpointer user_data)
+{
+       GValue val = { 0, };
+       gchar *str = NULL;
+       guint indent = GPOINTER_TO_UINT(user_data);
+
+       if (!gst_tag_list_copy_value(&val, tags, tag))
+               return;
+
+       if (G_VALUE_HOLDS_STRING(&val))
+               str = g_value_dup_string(&val);
+       else
+               str = gst_value_serialize(&val);
+
+       LOGD("%*s%s: %s\n", 2 * indent, " ", gst_tag_get_nick(tag), str);
+       g_free(str);
+       g_value_unset(&val);
+}
+#endif
+
+static void
+__mmplayer_dump_collection(GstStreamCollection * collection)
+{
+       guint i = 0;
+#ifdef __DEBUG__
+       GstTagList *tags = NULL;
+#endif
+       GstCaps *caps = NULL;
+
+       for (i = 0; i < gst_stream_collection_get_size(collection); i++) {
+               GstStream *stream = gst_stream_collection_get_stream(collection, i);
+               LOGD ("collection: [%u] Stream, type: %s, flags 0x%x\n", i,
+                               gst_stream_type_get_name(gst_stream_get_stream_type(stream)),
+                               gst_stream_get_stream_flags(stream));
+               LOGD ("  ID: %s\n", gst_stream_get_stream_id(stream));
+
+               caps = gst_stream_get_caps(stream);
+               if (caps) {
+                       MMPLAYER_LOG_GST_CAPS_TYPE(caps);
+                       gst_caps_unref(caps);
+               }
+
+#ifdef __DEBUG__
+               tags = gst_stream_get_tags(stream);
+               if (tags) {
+                       LOGD ("  tags:\n");
+                       gst_tag_list_foreach(tags, __mmplayer_print_tag_foreach, GUINT_TO_POINTER(MMPLAYER_TAG_INDENT));
+                       gst_tag_list_unref(tags);
+               }
+#endif
+       }
+}
+
 static void
 __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
 {
@@ -1922,6 +1954,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;
 
@@ -2006,6 +2039,48 @@ __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:
+       {
+               GstStreamCollection *collection = NULL;
+               LOGD("GST_MESSAGE_STREAM_COLLECTION : %s", GST_ELEMENT_NAME(GST_MESSAGE_SRC(msg)));
+
+               gst_message_parse_stream_collection(msg, &collection);
+               if (collection) {
+                       __mmplayer_dump_collection(collection);
+                       gst_object_unref(collection);
+               }
+       } break;
+       case GST_MESSAGE_STREAMS_SELECTED:
+       {
+               GstStreamCollection *collection = NULL;
+               LOGD("GST_MESSAGE_STREAMS_SELECTED : %s", GST_ELEMENT_NAME(GST_MESSAGE_SRC(msg)));
+
+               gst_message_parse_streams_selected(msg, &collection);
+               if (collection) {
+                       guint len = gst_message_streams_selected_get_size(msg);
+                       for (guint i = 0; i < len; i++) {
+                               GstStream *stream = gst_message_streams_selected_get_stream(msg, i);
+                               mmplayer_track_type_e type = __mmplayer_convert_gst_stream_type_to_track_type(
+                                                       gst_stream_get_stream_type(stream));
+                               if (type == MM_PLAYER_TRACK_TYPE_MAX) {
+                                       LOGD("not supported track type");
+                                       gst_object_unref(stream);
+                                       break;
+                               }
+                               LOGD("  Stream #%d : %s\n", i, gst_stream_get_stream_id(stream));
+                               if (player->track[type].active_track_index == INVALID_TRACK_INDEX) {
+                                       int stream_index = INVALID_TRACK_INDEX;
+                                       if (_mmplayer_get_track_index(player, type, stream, &stream_index) == MM_ERROR_NONE) {
+                                               player->track[type].active_track_index = stream_index;
+                                               LOGD("selected this stream, update active idx : %d",
+                                                               player->track[type].active_track_index);
+                                       }
+                               }
+                               gst_object_unref(stream);
+                       }
+                       gst_object_unref(collection);
+               }
+       } break;
 
 #ifdef __DEBUG__
        case GST_MESSAGE_REQUEST_STATE:         LOGD("GST_MESSAGE_REQUEST_STATE"); break;
@@ -2062,7 +2137,7 @@ __mmplayer_gst_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data
                                LOGE("TAGS received from element \"%s\".",
                                GST_STR_NULL(GST_ELEMENT_NAME(GST_MESSAGE_SRC(message))));
 
-                               gst_tag_list_foreach(tags, print_tag, NULL);
+                               gst_tag_list_foreach(tags, __mmplayer_print_tag_foreach, GUINT_TO_POINTER(MMPLAYER_TAG_INDENT));
                                gst_tag_list_unref(tags);
                                tags = NULL;
                        }
@@ -2074,6 +2149,18 @@ __mmplayer_gst_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data
        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.
@@ -2283,9 +2370,6 @@ __mmplayer_gst_create_es_decoder(mmplayer_t *player, mmplayer_stream_type_e type
                return FALSE;
        }
 
-       mainbin[elem_id].id = elem_id;
-       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);
@@ -2295,6 +2379,10 @@ __mmplayer_gst_create_es_decoder(mmplayer_t *player, mmplayer_stream_type_e type
        _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);
@@ -2322,6 +2410,10 @@ __mmplayer_gst_create_es_decoder(mmplayer_t *player, mmplayer_stream_type_e type
        gst_object_unref(GST_OBJECT(sinkpad));
 
        gst_element_sync_state_with_parent(decodebin);
+
+       mainbin[elem_id].id = elem_id;
+       mainbin[elem_id].gst = decodebin;
+
        MMPLAYER_FLEAVE();
        return TRUE;
 
@@ -2329,11 +2421,10 @@ ERROR:
        if (sinkpad)
                gst_object_unref(GST_OBJECT(sinkpad));
 
-       if (mainbin[elem_id].gst) {
-               gst_element_set_state(mainbin[elem_id].gst, GST_STATE_NULL);
-               gst_bin_remove(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), mainbin[elem_id].gst);
-               gst_object_unref(mainbin[elem_id].gst);
-               mainbin[elem_id].gst = NULL;
+       if (decodebin) {
+               gst_element_set_state(decodebin, GST_STATE_NULL);
+               if (!gst_bin_remove(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), decodebin))
+                       gst_object_unref(decodebin);
        }
 
        MMPLAYER_FLEAVE();
@@ -2467,15 +2558,15 @@ __mmplayer_gst_create_es_path(mmplayer_t *player, mmplayer_stream_type_e type, G
 ERROR:
        if (mainbin[src_id].gst) {
                gst_element_set_state(mainbin[src_id].gst, GST_STATE_NULL);
-               gst_bin_remove(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), mainbin[src_id].gst);
-               gst_object_unref(mainbin[src_id].gst);
+               if (!gst_bin_remove(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), mainbin[src_id].gst))
+                       gst_object_unref(mainbin[src_id].gst);
                mainbin[src_id].gst = NULL;
        }
 
        if (mainbin[queue_id].gst) {
                gst_element_set_state(mainbin[queue_id].gst, GST_STATE_NULL);
-               gst_bin_remove(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), mainbin[queue_id].gst);
-               gst_object_unref(mainbin[queue_id].gst);
+               if (!gst_bin_remove(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), mainbin[queue_id].gst))
+                       gst_object_unref(mainbin[queue_id].gst);
                mainbin[queue_id].gst = NULL;
        }
 
@@ -2542,7 +2633,7 @@ __mmplayer_gst_rtp_dynamic_pad(GstElement *element, GstPad *pad, gpointer data)
 
 NEW_ELEMENT:
 
-       /* excute new_element if created*/
+       /* execute new_element if created*/
        if (new_element) {
                LOGD("adding new element to pipeline");
 
@@ -2571,7 +2662,7 @@ NEW_ELEMENT:
                gst_object_unref(sinkpad);
                sinkpad = NULL;
 
-               /* run. setting PLAYING here since streamming source is live source */
+               /* run. setting PLAYING here since streaming source is live source */
                MMPLAYER_ELEMENT_SET_STATE(new_element, GST_STATE_PLAYING);
        }
 
@@ -2614,15 +2705,15 @@ __mmplayer_gst_rtp_no_more_pads(GstElement *element,  gpointer data)
 
         * [1] audio and video will be dumped with filesink.
         * [2] autoplugging is done by just using pad caps.
-        * [3] typefinding has happend in audio but audiosink is created already before no-more-pad signal
+        * [3] typefinding has happened in audio but audiosink is created already before no-more-pad signal
         * and the video will be dumped via filesink.
         */
        if (player->num_dynamic_pad == 0) {
-               LOGD("it seems pad caps is directely used for autoplugging. removing fakesink now");
+               LOGD("it seems pad caps is directly used for autoplugging. removing fakesink now");
 
                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.
@@ -2680,6 +2771,472 @@ __mmplayer_gst_make_rtsp_src(mmplayer_t *player)
        return element;
 }
 
+static void __mmplayer_http_src_setup(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));
+
+       attrs = MMPLAYER_GET_ATTRS(player);
+       if (!attrs) {
+               LOGE("failed to get content attribute");
+               return;
+       }
+
+       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;
+
+       SECURE_LOGD("cookies : %s", cookies);
+       SECURE_LOGD("user_agent :  %s", user_agent);
+       LOGD("timeout : %d", http_timeout);
+
+       g_object_set(G_OBJECT(source), "timeout", http_timeout, "blocksize", (unsigned long)(HTTP_SOURCE_BLOCK_SIZE), NULL);
+
+       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;
+}
+
+static void __mmplayer_rtsp_src_setup(GstElement *source, gpointer data)
+{
+       mmplayer_t *player = (mmplayer_t *)data;
+       gchar *user_agent = NULL;
+       MMHandleType attrs = 0;
+
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_IF_FAIL(player);
+
+       attrs = MMPLAYER_GET_ATTRS(player);
+       if (!attrs) {
+               LOGE("failed to get content attribute");
+               return;
+       }
+
+       mm_attrs_get_string_by_name(attrs, "streaming_user_agent", &user_agent);
+
+       SECURE_LOGD("user_agent : %s", user_agent);
+
+       if (user_agent)
+               g_object_set(G_OBJECT(source), "user-agent", user_agent, NULL);
+
+       MMPLAYER_FLEAVE();
+}
+
+static void
+__mmplayer_gst_found_source(GObject *object, GObject *orig, GParamSpec *pspec, gpointer data)
+{
+       mmplayer_t *player = (mmplayer_t *)data;
+       GstElement *source = NULL;
+
+       MMPLAYER_FENTER();
+       LOGD("%s >> %s", GST_ELEMENT_NAME(object), pspec->name);
+
+       g_object_get(orig, pspec->name, &source, NULL);
+
+       player->pipeline->mainbin[MMPLAYER_M_SRC].id = MMPLAYER_M_SRC;
+       player->pipeline->mainbin[MMPLAYER_M_SRC].gst = source;
+
+       if (MMPLAYER_IS_HTTP_STREAMING(player)) {
+               __mmplayer_http_src_setup(source, data);
+       } else if (MMPLAYER_IS_RTSP_STREAMING(player)) {
+               __mmplayer_rtsp_src_setup(source, data);
+       } else if (MMPLAYER_IS_SMOOTH_STREAMING(player)) {
+               g_object_set(G_OBJECT(source), "timeout", DEFAULT_HTTP_TIMEOUT, NULL);
+       } else if (player->profile.uri_type == MM_PLAYER_URI_TYPE_MEM) {
+               g_object_set(source, "stream-type", GST_APP_STREAM_TYPE_RANDOM_ACCESS,
+                       "size", (gint64)player->profile.input_mem.len, "blocksize", 20480, NULL);
+
+               _mmplayer_add_signal_connection(player, G_OBJECT(source), 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(source), MM_PLAYER_SIGNAL_TYPE_OTHERS, "need-data",
+                                               G_CALLBACK(__mmplayer_gst_appsrc_feed_data_mem), (gpointer)&player->profile.input_mem);
+       }
+       gst_object_unref (source);
+
+       MMPLAYER_FLEAVE();
+}
+
+static gint
+__mmplayer_gst_select_stream (GstElement * uridecodebin, GstStreamCollection * collection,
+    GstStream * stream, gpointer data)
+{
+#define RET_SELECT 1
+#define RET_SKIP 0
+#define RET_DEPENDS_ON_DECODEBIN -1
+
+       GstStreamType stype = gst_stream_get_stream_type(stream);
+       mmplayer_t *player = (mmplayer_t *)data;
+       mmplayer_track_type_e type = MM_PLAYER_TRACK_TYPE_MAX;
+       g_autoptr(GstCaps) caps = gst_stream_get_caps(stream);
+       g_autofree gchar *caps_str = NULL;
+       GstStructure *caps_structure = NULL;
+       int stream_index = INVALID_TRACK_INDEX;
+       int ret = MM_ERROR_NONE;
+
+       LOGD("Stream type %s flags 0x%x",
+                       gst_stream_type_get_name(stype),
+                       gst_stream_get_stream_flags(stream));
+       LOGD("  ID: %s", gst_stream_get_stream_id(stream));
+
+       type = __mmplayer_convert_gst_stream_type_to_track_type(stype);
+
+       if (caps) {
+               caps_str = gst_caps_to_string(caps);
+               caps_structure = gst_caps_get_structure(caps, 0);
+               const gchar *mime = gst_structure_get_name(caps_structure);
+
+               LOGD("  caps: %s", caps_str);
+
+               for (int idx = 0; player->ini.unsupported_codec_keyword[idx][0] != '\0'; idx++) {
+                       if (caps_str && strstr(caps_str, player->ini.unsupported_codec_keyword[idx])) {
+                               LOGW("skip [%s] by unsupported codec keyword [%s]",
+                                               mime, player->ini.unsupported_codec_keyword[idx]);
+
+                               _mmplayer_update_not_supported_codec_info(player, NULL, mime);
+                               return RET_SKIP;
+                       }
+               }
+       } else if (type == MM_PLAYER_TRACK_TYPE_AUDIO || type == MM_PLAYER_TRACK_TYPE_VIDEO) {
+               if (MMPLAYER_IS_HTTP_LIVE_STREAMING(player) || MMPLAYER_IS_DASH_STREAMING(player)) {
+                       LOGD("No caps info, depends on decodebin");
+                       _mmplayer_track_update_stream(player, type, stream);
+                       return RET_DEPENDS_ON_DECODEBIN;
+               }
+
+               LOGD("No caps info, skip it");
+               return RET_SKIP;
+       }
+
+       switch (stype) {
+       case GST_STREAM_TYPE_AUDIO:
+       {
+               if (caps_structure) {
+                       gint samplerate = 0;
+                       gint channels = 0;
+
+                       gst_structure_get_int(caps_structure, "rate", &samplerate);
+                       gst_structure_get_int(caps_structure, "channels", &channels);
+                       if (samplerate == 0 && channels > 0) {
+                               LOGW("Skip corrupted audio stream");
+                               return RET_SKIP;
+                       }
+
+                       if (g_strrstr(caps_str, "mobile-xmf"))
+                               mm_player_set_attribute((MMHandleType)player, NULL,
+                                       "content_audio_codec", "mobile-xmf", strlen("mobile-xmf"), NULL);
+               }
+               break;
+       }
+       case GST_STREAM_TYPE_VIDEO:
+       {
+               if (player->track[MM_PLAYER_TRACK_TYPE_VIDEO].total_track_num >= 1) {
+                       LOGD("do not support muti track video");
+                       break;
+               }
+
+               // FIXME: it cause block during preparing
+               if ((!MMPLAYER_IS_HTTP_LIVE_STREAMING(player)) && (!MMPLAYER_IS_DASH_STREAMING(player))) {
+                       gint stype = 0;
+
+                       mm_attrs_get_int_by_name(player->attrs, "display_surface_type", &stype);
+                       /* don't make video because of not required */
+                       if ((stype == MM_DISPLAY_SURFACE_NULL) &&
+                               (!player->set_mode.video_export)) {
+                               LOGD("no need video decoding, skip video stream");
+                               return RET_SKIP;
+                       }
+               }
+
+               if (caps_structure) {
+                       gint width = 0;
+
+                       gst_structure_get_int(caps_structure, "width", &width);
+                       if (width != 0) {
+                               if (player->v_stream_caps) {
+                                       gst_caps_unref(player->v_stream_caps);
+                                       player->v_stream_caps = NULL;
+                               }
+
+                               player->v_stream_caps = gst_caps_copy(caps);
+                               MMPLAYER_LOG_GST_CAPS_TYPE(player->v_stream_caps);
+                       }
+               }
+               break;
+       }
+       case GST_STREAM_TYPE_TEXT:
+               break;
+       default:
+               LOGW("Skip not supported stream type");
+               return RET_SKIP;
+       }
+
+       _mmplayer_track_update_stream(player, type, stream);
+
+       ret = _mmplayer_get_track_index(player, type, stream, &stream_index);
+
+       if ((player->track[type].active_track_index == INVALID_TRACK_INDEX) &&
+               (ret == MM_ERROR_NONE)) {
+               player->track[type].active_track_index = stream_index;
+               LOGD("select this stream, active track idx : %d", player->track[type].active_track_index);
+               if (type == MM_PLAYER_TRACK_TYPE_AUDIO)
+                       _mmplayer_set_audio_attrs(player, caps);
+               return RET_SELECT;
+       }
+
+       if (player->track[type].active_track_index == stream_index) {
+               LOGD("already activate track idx : %d", player->track[type].active_track_index);
+               return RET_SELECT;
+       }
+
+       LOGD("Skip stream");
+       return RET_SKIP;
+}
+
+static gboolean
+__mmplayer_gst_decode_request_resource(GstElement * uridecodebin, GstStreamCollection * collection,
+    GstStream * stream, gpointer data)
+{
+       mmplayer_t *player = (mmplayer_t *)data;
+       GstStreamType stype = gst_stream_get_stream_type(stream);
+
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE);
+
+       LOGD("stream type %s", gst_stream_type_get_name(stype));
+
+       /* public does not support audio hw decoder at the moment */
+
+       if (player->hw_resource[MMPLAYER_RESOURCE_TYPE_VIDEO_DECODER] != NULL) {
+               LOGW("video decoder resource is already acquired, skip it.");
+               return TRUE;
+       }
+
+       if (_mmplayer_acquire_hw_resource(player, MMPLAYER_RESOURCE_TYPE_VIDEO_DECODER) != MM_ERROR_NONE) {
+               LOGE("failed to acquire video decoder resource");
+               return FALSE;
+       }
+       player->interrupted_by_resource = FALSE;
+       MMPLAYER_FLEAVE();
+       return TRUE;
+}
+
+static GstElement *
+__mmplayer_gst_find_child_element(GstBin *bin, const gchar *element_name)
+{
+       GstIterator *iter = NULL;
+       GValue item = {0, };
+       GstElement *ch_element = NULL;
+       GstElementFactory *ch_factory = NULL;
+
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_VAL_IF_FAIL(bin && element_name, NULL);
+
+       iter = gst_bin_iterate_recurse(bin);
+       MMPLAYER_RETURN_VAL_IF_FAIL(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);
+               LOGD("children factory %s", GST_OBJECT_NAME(ch_factory));
+               if (g_strrstr(GST_OBJECT_NAME(ch_factory), element_name)) {
+                       LOGD("Find %s element", element_name);
+                       break;
+               }
+               ch_element = NULL;
+               g_value_reset(&item);
+       }
+       g_value_unset(&item);
+       gst_iterator_free(iter);
+
+       MMPLAYER_FLEAVE();
+       return ch_element;
+}
+
+static void __mmplayer_parsebin_setup(GstBin *bin, gpointer data)
+{
+       mmplayer_t *player = (mmplayer_t *)data;
+
+       g_object_set(G_OBJECT(bin), "message-forward", TRUE, NULL);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(bin),
+       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "unknown-type",
+                       G_CALLBACK(_mmplayer_gst_decode_unknown_type), (gpointer)player);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(bin),
+       MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "autoplug-select",
+                       G_CALLBACK(_mmplayer_gst_decode_autoplug_select), (gpointer)player);
+}
+
+static void __mmplayer_decodebin3_setup(GstBin *bin, gpointer data)
+{
+       mmplayer_t *player = (mmplayer_t *)data;
+       int video_codec_type = 0;
+       int audio_codec_type = 0;
+
+       g_object_set(G_OBJECT(bin), "message-forward", TRUE, NULL);
+
+       mm_attrs_get_int_by_name(player->attrs, MM_PLAYER_VIDEO_CODEC_TYPE, &video_codec_type);
+       mm_attrs_get_int_by_name(player->attrs, MM_PLAYER_AUDIO_CODEC_TYPE, &audio_codec_type);
+
+       LOGD("set codec type v(%d) a(%d)", video_codec_type, audio_codec_type);
+
+       if (video_codec_type == MM_PLAYER_CODEC_TYPE_SW)
+               g_object_set(G_OBJECT(bin), "force-sw-decoders-for-video", TRUE, NULL);
+       if (audio_codec_type == MM_PLAYER_CODEC_TYPE_SW)
+               g_object_set(G_OBJECT(bin), "force-sw-decoders-for-audio", TRUE, NULL);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(bin), MM_PLAYER_SIGNAL_TYPE_AUTOPLUG,
+                       "request-resource", G_CALLBACK(__mmplayer_gst_decode_request_resource), (gpointer)player);
+}
+
+static 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_FENTER();
+       MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->mainbin);
+
+       factory_name = GST_OBJECT_NAME(gst_element_get_factory(element));
+
+       LOGD("child: %s, elem: %s (%s)", GST_ELEMENT_NAME(child), factory_name, GST_ELEMENT_NAME(element));
+
+       if (g_strrstr(factory_name, "urisourcebin")) {
+               GstElement *dbin3 = __mmplayer_gst_find_child_element(child, "decodebin3");
+               if (dbin3) {
+                       GstElement *mq = __mmplayer_gst_find_child_element(child, "multiqueue");
+                       if (mq)
+                               g_object_set(G_OBJECT(mq), "use-interleave", FALSE, NULL);
+
+                       __mmplayer_decodebin3_setup(GST_BIN(dbin3), data);
+               } else {
+                       LOGW("failed to find decodebin3");
+               }
+       } else if (g_strrstr(factory_name, "parsebin")) {
+               g_object_set(G_OBJECT(child), "message-forward", TRUE, NULL); /* urisourcebin */
+               __mmplayer_parsebin_setup(GST_BIN(element), data);
+       } else {
+               _mmplayer_gst_element_added(child, element, data);
+       }
+}
+
+static void
+__mmplayer_delete_signal_connection(mmplayer_t *player, GstElement *removed_element)
+{
+       MMPLAYER_FENTER();
+
+       MMPLAYER_RETURN_IF_FAIL(player);
+       MMPLAYER_RETURN_IF_FAIL(removed_element);
+
+       LOGD("delete signal on %s", GST_ELEMENT_NAME(removed_element));
+
+       for (int type = MM_PLAYER_SIGNAL_TYPE_AUTOPLUG; type < MM_PLAYER_SIGNAL_TYPE_ALL; type++) {
+               GList *node = player->signals[type];
+               while (node) {
+                       GList *next_node = node->next;
+                       mmplayer_signal_item_t *item = node->data;
+                       if (item && item->obj == G_OBJECT(removed_element)) {
+                               player->signals[type] = g_list_delete_link(player->signals[type], node);
+                               MMPLAYER_FREEIF(item);
+                       }
+                       node = next_node;
+               }
+       }
+
+       MMPLAYER_FLEAVE();
+}
+
+void
+__mmplayer_gst_deep_element_removed(GstElement *bin, GstBin *child, GstElement *element, gpointer data)
+{
+       mmplayer_t *player = (mmplayer_t *)data;
+
+       MMPLAYER_FENTER();
+
+       MMPLAYER_RETURN_IF_FAIL(player);
+
+       LOGD("%s > %s > %s", GST_ELEMENT_NAME(bin), GST_ELEMENT_NAME(child), GST_ELEMENT_NAME(element));
+
+       __mmplayer_delete_signal_connection(player, element);
+
+       MMPLAYER_FLEAVE();
+}
+
+static GstElement *
+__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,
+                       "buffer-size", DEFAULT_BUFFER_SIZE_BYTES,
+                       "use-buffering", TRUE, NULL);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "deep-notify::source", G_CALLBACK(__mmplayer_gst_found_source), (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);
+
+       _mmplayer_add_signal_connection(player, G_OBJECT(uridecodebin3),
+               MM_PLAYER_SIGNAL_TYPE_AUTOPLUG, "about-to-finish", G_CALLBACK(_mmplayer_gst_about_to_finish), (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)
 {
@@ -2702,7 +3259,7 @@ __mmplayer_gst_make_http_src(mmplayer_t *player)
                return NULL;
        }
 
-       LOGD("using http streamming source [%s]", player->ini.httpsrc_element);
+       LOGD("using http streaming source [%s]", player->ini.httpsrc_element);
 
        element = gst_element_factory_make(player->ini.httpsrc_element, "http_streaming_source");
        if (!element) {
@@ -2777,7 +3334,6 @@ __mmplayer_gst_msg_push(GstBus *bus, GstMessage *msg, gpointer data)
 
        g_return_val_if_fail(player, FALSE);
        g_return_val_if_fail(msg && GST_IS_MESSAGE(msg), FALSE);
-
        gst_message_ref(msg);
 
        g_mutex_lock(&player->bus_msg_q_lock);
@@ -2794,7 +3350,6 @@ static gpointer __mmplayer_gst_bus_msg_thread(gpointer data)
 {
        mmplayer_t *player = (mmplayer_t *)(data);
        GstMessage *msg = NULL;
-       GstBus *bus = NULL;
 
        MMPLAYER_FENTER();
        MMPLAYER_RETURN_VAL_IF_FAIL(player &&
@@ -2803,12 +3358,6 @@ static gpointer __mmplayer_gst_bus_msg_thread(gpointer data)
                                                player->pipeline->mainbin[MMPLAYER_M_PIPE].gst,
                                                NULL);
 
-       bus = gst_pipeline_get_bus(GST_PIPELINE(player->pipeline->mainbin[MMPLAYER_M_PIPE].gst));
-       if (!bus) {
-               LOGE("cannot get BUS from the pipeline");
-               return NULL;
-       }
-
        MMPLAYER_BUS_MSG_THREAD_LOCK(player);
 
        LOGD("[handle: %p] gst bus msg thread will be started.", player);
@@ -2828,16 +3377,16 @@ static gpointer __mmplayer_gst_bus_msg_thread(gpointer data)
        }
 
        MMPLAYER_BUS_MSG_THREAD_UNLOCK(player);
-       gst_object_unref(GST_OBJECT(bus));
-
        MMPLAYER_FLEAVE();
+
        return NULL;
 }
 
 static int
-__mmplayer_gst_check_duration(mmplayer_t *player, gint64 position)
+__mmplayer_gst_check_position(mmplayer_t *player, gint64 position)
 {
        gint64 dur_nsec = 0;
+       gint64 pos_nsec = 0;
 
        MMPLAYER_FENTER();
        MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline, MM_ERROR_PLAYER_NOT_INITIALIZED);
@@ -2846,7 +3395,7 @@ __mmplayer_gst_check_duration(mmplayer_t *player, gint64 position)
                return MM_ERROR_NONE;
 
        /* NOTE : duration cannot be zero except live streaming.
-        *              Since some element could have some timing problemn with quering duration, try again.
+        *              Since some element could have some timing problem with querying duration, try again.
         */
        if (player->duration == 0) {
                if (!gst_element_query_duration(player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_FORMAT_TIME, &dur_nsec)) {
@@ -2872,6 +3421,15 @@ __mmplayer_gst_check_duration(mmplayer_t *player, gint64 position)
                return MM_ERROR_INVALID_ARGUMENT;
        }
 
+       if (gst_element_query_position(player->pipeline->mainbin[MMPLAYER_M_PIPE].gst, GST_FORMAT_TIME, &pos_nsec)) {
+               if ((pos_nsec == player->duration) && /* current pos is end of stream  */
+                       ((position / GST_MSECOND) == (player->duration / GST_MSECOND))) {
+                       MMPLAYER_POST_MSG(player, MM_MESSAGE_SEEK_COMPLETED, NULL);
+                       player->seek_state = MMPLAYER_SEEK_NONE;
+                       return MM_ERROR_PLAYER_NO_OP;
+               }
+       }
+
        MMPLAYER_FLEAVE();
        return MM_ERROR_NONE;
 }
@@ -2984,7 +3542,7 @@ _mmplayer_gst_start(mmplayer_t *player)
 
                MMPLAYER_TARGET_STATE(player) = MM_PLAYER_STATE_PLAYING;
                if (__mmplayer_gst_pending_seek(player) != MM_ERROR_NONE)
-                               LOGW("failed to seek pending postion. starting from the begin of content");
+                               LOGW("failed to seek pending position. starting from the begin of content");
        }
 
        LOGD("current state before doing transition");
@@ -3033,7 +3591,7 @@ _mmplayer_gst_stop(mmplayer_t *player)
                return MM_ERROR_PLAYER_INTERNAL;
        }
 
-       /* Just set state to PAUESED and the rewind. it's usual player behavior. */
+       /* Just set state to PAUSED and the rewind. it's usual player behavior. */
        timeout = MMPLAYER_STATE_CHANGE_TIMEOUT(player);
 
        if ((!MMPLAYER_IS_STREAMING(player) && !MMPLAYER_IS_MS_BUFF_SRC(player)) ||
@@ -3148,7 +3706,7 @@ _mmplayer_gst_pause(mmplayer_t *player, gboolean async)
                                                /* Note : the streaming error from the streaming source is handled
                                                        *   using __mmplayer_handle_streaming_error.
                                                        */
-                                               __mmplayer_handle_streaming_error(player, msg);
+                                               __mmplayer_handle_streaming_error(player, msg, error);
 
                                        } else if (error) {
                                                LOGE("paring error posted from bus, domain : %s, code : %d", g_quark_to_string(error->domain), error->code);
@@ -3177,9 +3735,11 @@ _mmplayer_gst_pause(mmplayer_t *player, gboolean async)
                return ret;
        }
 
-       if ((!MMPLAYER_IS_RTSP_STREAMING(player)) && (!player->video_decoded_cb) &&
-               (!player->pipeline->videobin) && (!player->pipeline->audiobin))
-               return MM_ERROR_PLAYER_CODEC_NOT_FOUND;
+       if (MMPLAYER_USE_DECODEBIN(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);
 
@@ -3268,7 +3828,7 @@ _mmplayer_gst_send_event_to_sink(mmplayer_t *player, GstEvent *event)
                                LOGD("sending event[%s] to sink element [%s] success!",
                                        GST_EVENT_TYPE_NAME(event), GST_ELEMENT_NAME(sink));
 
-                               /* rtsp case, asyn_done is not called after seek during pause state */
+                               /* rtsp case, async_done is not called after seek during pause state */
                                if (MMPLAYER_IS_RTSP_STREAMING(player)) {
                                        if (GST_EVENT_TYPE(event) == GST_EVENT_SEEK) {
                                                if (MMPLAYER_TARGET_STATE(player) == MM_PLAYER_STATE_PAUSED) {
@@ -3296,7 +3856,7 @@ _mmplayer_gst_send_event_to_sink(mmplayer_t *player, GstEvent *event)
        }
 
        /* Note : Textbin is not linked to the video or audio bin.
-        * It needs to send the event to the text sink seperatelly.
+        * It needs to send the event to the text sink separately.
         */
        if (player->play_subtitle && player->pipeline) {
                GstElement *text_sink = GST_ELEMENT_CAST(player->pipeline->textbin[MMPLAYER_T_FAKE_SINK].gst);
@@ -3353,7 +3913,7 @@ _mmplayer_gst_set_position(mmplayer_t *player, gint64 position, gboolean interna
 {
        int ret = MM_ERROR_NONE;
        gint64 pos_nsec = 0;
-       gboolean accurated = FALSE;
+       gboolean accurate = FALSE;
        GstSeekFlags seek_flags = GST_SEEK_FLAG_FLUSH;
 
        MMPLAYER_FENTER();
@@ -3364,9 +3924,9 @@ _mmplayer_gst_set_position(mmplayer_t *player, gint64 position, gboolean interna
                && (MMPLAYER_CURRENT_STATE(player) != MM_PLAYER_STATE_PAUSED))
                goto PENDING;
 
-       ret = __mmplayer_gst_check_duration(player, position);
+       ret = __mmplayer_gst_check_position(player, position);
        if (ret != MM_ERROR_NONE) {
-               LOGE("failed to check duration 0x%X", ret);
+               LOGW("result of check position info 0x%X", ret);
                return (ret == MM_ERROR_PLAYER_NO_OP) ? MM_ERROR_NONE : ret;
        }
 
@@ -3411,8 +3971,8 @@ _mmplayer_gst_set_position(mmplayer_t *player, gint64 position, gboolean interna
                player->seek_state = MMPLAYER_SEEK_NONE;
                MMPLAYER_POST_MSG(player, MM_MESSAGE_SEEK_COMPLETED, NULL);
        } else {
-               mm_attrs_get_int_by_name(player->attrs, "accurate_seek", &accurated);
-               if (accurated)
+               mm_attrs_get_int_by_name(player->attrs, "accurate_seek", &accurate);
+               if (accurate)
                        seek_flags |= GST_SEEK_FLAG_ACCURATE;
                else
                        seek_flags |= GST_SEEK_FLAG_KEY_UNIT;
@@ -3430,7 +3990,7 @@ _mmplayer_gst_set_position(mmplayer_t *player, gint64 position, gboolean interna
         */
        player->last_position = position;
 
-       /* MSL should guarante playback rate when seek is selected during trick play of fast forward. */
+       /* MSL should guarantee playback rate when seek is selected during trick play of fast forward. */
        if (player->playback_rate > 1.0)
                _mmplayer_set_playspeed((MMHandleType)player, player->playback_rate, FALSE);
 
@@ -3481,7 +4041,7 @@ _mmplayer_gst_get_position(mmplayer_t *player, gint64 *position)
 
        /* NOTE : get last point to overcome some bad operation of some elements
         *(returning zero when getting current position in paused state
-        * and when failed to get postion during seeking
+        * and when failed to get position during seeking
         */
        if ((current_state == MM_PLAYER_STATE_PAUSED) || (!ret)) {
                LOGD("pos_nsec = %"GST_TIME_FORMAT" and ret = %d and state = %d", GST_TIME_ARGS(pos_nsec), ret, current_state);
@@ -3616,7 +4176,7 @@ _mmplayer_gst_get_buffer_position(mmplayer_t *player, int *start_pos, int *end_p
                                g_object_get(G_OBJECT(mainbin[MMPLAYER_M_DEMUXED_S_BUFFER].gst),
                                        "curr-size-bytes", &curr_size_bytes, NULL);
                                LOGD("curr_size_bytes of multiqueue = %d", curr_size_bytes);
-                               buffered_total += curr_size_bytes;
+                               buffered_total += (gint64)curr_size_bytes;
                        }
 
                        if (avg_byterate > 0)
@@ -3700,6 +4260,80 @@ _mmplayer_gst_build_es_pipeline(mmplayer_t *player)
 }
 
 int
+_mmplayer_gst_build_pipeline_with_src(mmplayer_t *player)
+{
+       mmplayer_gst_element_t *mainbin = NULL;
+       GstElement *autoplug_elem = NULL;
+
+       MMPLAYER_FENTER();
+       MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline &&
+                               player->pipeline->mainbin, MM_ERROR_PLAYER_NOT_INITIALIZED);
+
+       mainbin = player->pipeline->mainbin;
+
+       LOGD("uri type %d", player->profile.uri_type);
+
+       if ((player->profile.uri_type == MM_PLAYER_URI_TYPE_FILE) &&
+               (!_mmplayer_get_storage_info(player->profile.uri, &player->storage_info[MMPLAYER_PATH_VOD]))) {
+               return MM_ERROR_PLAYER_INTERNAL;
+       }
+
+       if (player->profile.uri_type == MM_PLAYER_URI_TYPE_MEM) {
+               g_strlcpy(player->profile.uri, "appsrc://", MM_MAX_URL_LEN);
+       }
+
+       autoplug_elem = __mmplayer_gst_make_uridecodebin(player);
+       if (!autoplug_elem) {
+               LOGE("failed to create uridecodebin3 element");
+               goto ERROR;
+       }
+
+       LOGD("autoplug elem is created %s", GST_ELEMENT_NAME(autoplug_elem));
+       mainbin[MMPLAYER_M_AUTOPLUG].id = MMPLAYER_M_AUTOPLUG;
+       mainbin[MMPLAYER_M_AUTOPLUG].gst = autoplug_elem;
+
+       if (!gst_bin_add(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), autoplug_elem)) {
+               LOGE("failed to add uridecodebin to pipeline");
+               goto ERROR;
+       }
+
+       /* 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");
+
+       if (!mainbin[MMPLAYER_M_SRC_FAKESINK].gst) {
+               LOGE("failed to create fakesink");
+               goto ERROR;
+       }
+       GST_OBJECT_FLAG_UNSET(mainbin[MMPLAYER_M_SRC_FAKESINK].gst, GST_ELEMENT_FLAG_SINK);
+
+       /* take ownership of fakesink. we are reusing it */
+       gst_object_ref(mainbin[MMPLAYER_M_SRC_FAKESINK].gst);
+
+       if (!gst_bin_add(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), mainbin[MMPLAYER_M_SRC_FAKESINK].gst)) {
+               LOGE("failed to add fakesink to bin");
+               gst_object_unref(mainbin[MMPLAYER_M_SRC_FAKESINK].gst);
+               goto ERROR;
+       }
+
+       MMPLAYER_FLEAVE();
+       return MM_ERROR_NONE;
+
+ERROR:
+
+       if (mainbin[MMPLAYER_M_AUTOPLUG].gst)
+               gst_object_unref(GST_OBJECT(mainbin[MMPLAYER_M_AUTOPLUG].gst));
+
+       if (mainbin[MMPLAYER_M_SRC_FAKESINK].gst)
+               gst_object_unref(GST_OBJECT(mainbin[MMPLAYER_M_SRC_FAKESINK].gst));
+
+       mainbin[MMPLAYER_M_AUTOPLUG].gst = NULL;
+       mainbin[MMPLAYER_M_SRC_FAKESINK].gst = NULL;
+
+       return MM_ERROR_PLAYER_INTERNAL;
+}
+
+int
 _mmplayer_gst_build_pipeline(mmplayer_t *player)
 {
        mmplayer_gst_element_t *mainbin = NULL;
@@ -3891,7 +4525,17 @@ _mmplayer_gst_add_bus_watch(mmplayer_t *player)
                return MM_ERROR_PLAYER_INTERNAL;
        }
 
-       player->bus_watcher = gst_bus_add_watch(bus, (GstBusFunc)__mmplayer_gst_msg_push, player);
+       player->bus_watcher = gst_bus_add_watch_full(bus, G_PRIORITY_DEFAULT,
+                                                       (GstBusFunc)__mmplayer_gst_msg_push, player,
+                                                       (GDestroyNotify)_mmplayer_watcher_removed_notify);
+       if (player->bus_watcher == 0) {
+               LOGE("failed to add bus watch");
+               return MM_ERROR_PLAYER_INTERNAL;
+       }
+
+       g_mutex_init(&player->bus_watcher_mutex);
+       g_cond_init(&player->bus_watcher_cond);
+
        player->context.thread_default = g_main_context_get_thread_default();
        if (player->context.thread_default == NULL) {
                player->context.thread_default = g_main_context_default();
@@ -3923,6 +4567,7 @@ _mmplayer_gst_add_bus_watch(mmplayer_t *player)
 void
 _mmplayer_activate_next_source(mmplayer_t *player, GstState target)
 {
+       int ret = MM_ERROR_NONE;
        mmplayer_gst_element_t *mainbin = NULL;
        MMMessageParamType msg_param = {0,};
        GstElement *element = NULL;
@@ -3961,6 +4606,18 @@ _mmplayer_activate_next_source(mmplayer_t *player, GstState target)
                goto ERROR;
        }
 
+       if (!MMPLAYER_USE_DECODEBIN(player)) {
+               ret = _mmplayer_gst_build_pipeline_with_src(player);
+               if (ret != MM_ERROR_NONE)
+                       goto ERROR;
+
+               if (gst_element_set_state(mainbin[MMPLAYER_M_AUTOPLUG].gst, target) == GST_STATE_CHANGE_FAILURE) {
+                       LOGE("Failed to change state of uridecodebin3 element");
+                       goto ERROR;
+               }
+               goto DONE;
+       }
+
        element = _mmplayer_gst_create_source(player);
        if (!element) {
                LOGE("no source element was created");
@@ -4002,7 +4659,7 @@ _mmplayer_activate_next_source(mmplayer_t *player, GstState target)
        }
 
        if (gst_bin_add(GST_BIN(mainbin[MMPLAYER_M_PIPE].gst), element) == FALSE) {
-               LOGE("failed to add sinkbin to pipeline");
+               LOGE("failed to add %s to pipeline", GST_ELEMENT_NAME(element));
                gst_object_unref(GST_OBJECT(element));
                element = NULL;
                goto ERROR;
@@ -4016,23 +4673,24 @@ _mmplayer_activate_next_source(mmplayer_t *player, GstState target)
                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;
-       }
-
-       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");
+       if (MMPLAYER_IS_HTTP_STREAMING(player)) {
+               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;
                }
        } else {
-               if (gst_element_set_state(mainbin[MMPLAYER_M_TYPEFIND].gst, target) == GST_STATE_CHANGE_FAILURE) {
-                       LOGE("Failed to change state of src element");
+               if (gst_element_set_state(mainbin[MMPLAYER_M_AUTOPLUG].gst, target) == GST_STATE_CHANGE_FAILURE) {
+                       LOGE("Failed to change state of decodebin");
                        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;
+       }
+
+DONE:
        player->gapless.stream_changed = TRUE;
        player->gapless.running = TRUE;
        MMPLAYER_FLEAVE();
@@ -4040,8 +4698,7 @@ _mmplayer_activate_next_source(mmplayer_t *player, GstState target)
 
 ERROR:
        if (player) {
-               MMPLAYER_PLAYBACK_UNLOCK(player);
-
+               _mmplayer_set_reconfigure_state(player, FALSE);
                if (!player->msg_posted) {
                        MMPLAYER_POST_MSG(player, MM_MESSAGE_ERROR, &msg_param);
                        player->msg_posted = TRUE;