Changeset 209796 in webkit

Timestamp:

Dec 14, 2016 2:36:32 AM (7 years ago)

Author:

eocanha@igalia.com

Message:

[GStreamer][MSE] Fix player private selection when MSE is enabled
​https://bugs.webkit.org/show_bug.cgi?id=164116

Reviewed by Philippe Normand.

Covered by existing tests.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::load):

• platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:

(WebCore::MediaPlayerPrivateGStreamerMSE::load):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-14  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GStreamer][MSE] Fix player private selection when MSE is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=164116
+
+        Reviewed by Philippe Normand.
+
+        Covered by existing tests.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::load):
+        * platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerMSE::load):
+
 2016-12-13  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -273 +273 @@
 void MediaPlayerPrivateGStreamer::load(const String&, MediaSourcePrivateClient*)
 {
-    notImplemented();
+    // Properly fail so the global MediaPlayer tries to fallback to the next MediaPlayerPrivate.
+    m_networkState = MediaPlayer::FormatError;
+    m_player->networkStateChanged();
 }
 #endif

trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp

@@ -126 +126 @@
 void MediaPlayerPrivateGStreamerMSE::load(const String& urlString)
 {
+    if (!urlString.startsWith("mediasource")) {
+        // Properly fail so the global MediaPlayer tries to fallback to the next MediaPlayerPrivate.
+        m_networkState = MediaPlayer::FormatError;
+        m_player->networkStateChanged();
+        return;
+    }
+
     if (UNLIKELY(!initializeGStreamerAndRegisterWebKitMSEElement()))
         return;
-
-    if (!urlString.startsWith("mediasource")) {
-        GST_ERROR("Unsupported url: %s", urlString.utf8().data());
-        return;
-    }
 
     if (!m_playbackPipeline)