Attachment 347264 Details for Bug 188653 – Patch

[patch] Patch

bug-188653-20180816162012.patch (text/plain), 2.98 KB, created by Philippe Normand on 2018-08-16 08:20:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2018-08-16 08:20:13 PDT

Size: 2.98 KB

patch

obsolete

>Subversion Revision: 234920
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index bed7d527e4e8841320390c0691d6a0422030411f..a2ece9c4cd1c36fc79013362463f157b281b26f0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-16  Philippe Normand  <philn@igalia.com>
>+
>+        [GStreamer] Warn early about incomplete MSE track switching support
>+        https://bugs.webkit.org/show_bug.cgi?id=188653
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The proper track switching support shall be fixed at some point by:
>+        https://bugs.webkit.org/show_bug.cgi?id=182531.
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamer::updateTracks): Remove redundant test.
>+        (WebCore::MediaPlayerPrivateGStreamer::enableTrack): Exit early if
>+        this method is called by the MSE player.
>+
> 2018-08-16  Antti Koivisto  <antti@apple.com>
> 
>         Use OptionSet for ActivityState::Flags
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>index c623501e908d542a28f504fe12a8bf75045c5799..0fd55d2463b9c07611fdad947bad0eb930cbffa3 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>@@ -714,18 +714,18 @@ void MediaPlayerPrivateGStreamer::updateTracks()
>     if (m_hasVideo)
>         m_player->sizeChanged();
> 
>-    if (useMediaSource) {
>-        GST_DEBUG("Tracks managed by source element. Bailing out now.");
>-        m_player->client().mediaPlayerEngineUpdated(m_player);
>-        return;
>-    }
>-
>     m_player->client().mediaPlayerEngineUpdated(m_player);
> }
> #endif // GST_CHECK_VERSION(1, 10, 0)
> 
> void MediaPlayerPrivateGStreamer::enableTrack(TrackPrivateBaseGStreamer::TrackType trackType, unsigned index)
> {
>+    // FIXME: Remove isMediaSource() test below when fixing https://bugs.webkit.org/show_bug.cgi?id=182531
>+    if (isMediaSource()) {
>+        GST_FIXME_OBJECT(m_pipeline.get(), "Audio/Video/Text track switching is not yet supported by the MSE backend.");
>+        return;
>+    }
>+
>     const char* propertyName;
>     const char* trackTypeAsString;
>     Vector<String> selectedStreams;
>@@ -791,11 +791,8 @@ void MediaPlayerPrivateGStreamer::enableTrack(TrackPrivateBaseGStreamer::TrackTy
>     }
> 
>     GST_INFO("Enabling %s track with index: %u", trackTypeAsString, index);
>-    // FIXME: Remove isMediaSource() test below when fixing https://bugs.webkit.org/show_bug.cgi?id=182531
>-    if (m_isLegacyPlaybin || isMediaSource()) {
>-        GstElement* element = isMediaSource() ? m_source.get() : m_pipeline.get();
>-        g_object_set(element, propertyName, index, nullptr);
>-    }
>+    if (m_isLegacyPlaybin)
>+        g_object_set(m_pipeline.get(), propertyName, index, nullptr);
> #if GST_CHECK_VERSION(1, 10, 0)
>     else {
>         GList* selectedStreamsList = nullptr;

Flags:

calvaris: review+
calvaris: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188653: 347264 | 347383