Changeset 162540 in webkit

Timestamp:

Jan 22, 2014 11:24:20 AM (10 years ago)

Author:

jer.noble@apple.com

Message:

[Mac] MediaPlayerPrivateMediaSourceAVFObjC::load ASSERTs on lots of tests
​https://bugs.webkit.org/show_bug.cgi?id=127430

Reviewed by Eric Carlson.

When other registered media engines cannot load a URL, the engine selection
will eventually pick MediaPlayerPrivateMediaSourceAVFObjC and ask it to load
the URL. Instead of ASSERTing here, simply reject the URL by setting the
network state to FormatError.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-22  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] MediaPlayerPrivateMediaSourceAVFObjC::load ASSERTs on lots of tests
+        https://bugs.webkit.org/show_bug.cgi?id=127430
+
+        Reviewed by Eric Carlson.
+
+        When other registered media engines cannot load a URL, the engine selection
+        will eventually pick MediaPlayerPrivateMediaSourceAVFObjC and ask it to load
+        the URL. Instead of ASSERTing here, simply reject the URL by setting the
+        network state to FormatError.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load):
+
 2014-01-22  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm

@@ -222 +222 @@
 void MediaPlayerPrivateMediaSourceAVFObjC::load(const String&)
 {
-    ASSERT_NOT_REACHED();
+    // This media engine only supports MediaSource URLs.
+    m_networkState = MediaPlayer::FormatError;
+    m_player->networkStateChanged();
 }