[Mac] MediaPlayerPrivateMediaSourceAVFObjC::load ASSERTs on lots of tests
authorjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jan 2014 19:24:20 +0000 (19:24 +0000)
committerjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jan 2014 19:24:20 +0000 (19:24 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index e0c7f21..d1d98e9 100644 (file)
@@ -1,3 +1,18 @@
+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>
 
         [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
index 4c16504..989fe91 100644 (file)
@@ -221,7 +221,9 @@ MediaPlayer::SupportsType MediaPlayerPrivateMediaSourceAVFObjC::supportsType(con
 
 void MediaPlayerPrivateMediaSourceAVFObjC::load(const String&)
 {
-    ASSERT_NOT_REACHED();
+    // This media engine only supports MediaSource URLs.
+    m_networkState = MediaPlayer::FormatError;
+    m_player->networkStateChanged();
 }
 
 void MediaPlayerPrivateMediaSourceAVFObjC::load(const String& url, PassRefPtr<HTMLMediaSource> source)