[0.6.226] add typefinding in parsebin

- skip sink-caps property setting to do typefinding
  in parsebin
- urisourcebin detect adaptive format and
  parsebin need to detect content type.

Change-Id: Ied35cd4a6bdcdc60a906bfd9d9d2c31843372ae1

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 7109f68..240a992 100644 (file)
--- a/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@ -1,6 +1,6 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
-Version:    0.6.225
+Version:    0.6.226
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_player_gst.c b/src/mm_player_gst.c
index 33e0eed..93ef443 100644 (file)
--- a/src/mm_player_gst.c
+++ b/src/mm_player_gst.c
@@ -3125,7 +3125,9 @@ __mmplayer_gst_deep_element_added(GstElement *bin, GstBin *child, GstElement *el
 
                g_object_set(G_OBJECT(child), "message-forward", TRUE, NULL);
                g_object_set(G_OBJECT(element), "message-forward", TRUE, NULL);
-               if (player->type_caps)
+               if (player->type_caps &&
+                       !MMPLAYER_IS_HTTP_LIVE_STREAMING(player) &&
+                       !MMPLAYER_IS_DASH_STREAMING(player))
                        g_object_set(G_OBJECT(element), "sink-caps", player->type_caps, NULL);
 
                mm_attrs_get_int_by_name(player->attrs, MM_PLAYER_VIDEO_CODEC_TYPE, &video_codec_type);

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index 15ecef3..1f13b38 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -5653,9 +5653,11 @@ _mmplayer_pause(MMHandleType hplayer)
 
        /* pause pipeline */
        ret = _mmplayer_gst_pause(player, async);
-
-       if (ret != MM_ERROR_NONE)
+       if (ret != MM_ERROR_NONE) {
                LOGE("failed to pause player. ret : 0x%x", ret);
+               MMPLAYER_GENERATE_DOT_IF_ENABLED(player, "pipeline-pause-err");
+               return ret;
+       }
 
        if (MMPLAYER_PREV_STATE(player) == MM_PLAYER_STATE_READY && MMPLAYER_CURRENT_STATE(player) == MM_PLAYER_STATE_PAUSED) {
                if (_mmplayer_update_video_overlay_param(player, "display_rotation") != MM_ERROR_NONE)
@@ -5663,8 +5665,7 @@ _mmplayer_pause(MMHandleType hplayer)
        }
 
        MMPLAYER_FLEAVE();
-
-       return ret;
+       return MM_ERROR_NONE;
 }
 
 /* in case of streaming, pause could take long time.*/