Changeset 190020 in webkit

Timestamp:

Sep 19, 2015 5:43:08 PM (9 years ago)

Author:

eric.carlson@apple.com

Message:

Cleanup code that finds and loads a media engine
​https://bugs.webkit.org/show_bug.cgi?id=149371

Reviewed by Darin Adler.

No new tests, no functional change.

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::setRegistry): New, set the registry.
(WebCore::MediaStream::lookup): New, lookup a url in the registry.

• Modules/mediastream/MediaStream.h:

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::loadResource): Restructure and simplify the code that tries the

different types of media engine so the code is easier to understand and modify.

(WebCore::HTMLMediaElement::createMediaPlayer): Clear m_mediaStreamSrcObject.

• platform/graphics/MediaPlayer.cpp:

(WebCore::buildMediaEnginesVector): Add some whitespace to make it easier to read.
(WebCore::bestMediaEngineForSupportParameters): Also process mediastream and mediasource urls.
(WebCore::MediaPlayer::load): ASSERT if called when the reload timer is active.
(WebCore::MediaPlayer::loadWithNextMediaEngine): Also process mediastream and mediasource urls.

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

(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): Don't test empty/null urls.

• platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:

(WebCore::MockMediaPlayerMediaSource::supportsType): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStream.cpp (modified) (2 diffs)
• Modules/mediastream/MediaStream.h (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (4 diffs)
• platform/graphics/MediaPlayer.cpp (modified) (8 diffs)
• platform/graphics/MediaPlayer.h (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (modified) (1 diff)
• platform/mock/mediasource/MockMediaPlayerMediaSource.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-19  Eric Carlson  <eric.carlson@apple.com>
+
+        Cleanup code that finds and loads a media engine
+        https://bugs.webkit.org/show_bug.cgi?id=149371
+
+        Reviewed by Darin Adler.
+
+        No new tests, no functional change.
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::setRegistry): New, set the registry.
+        (WebCore::MediaStream::lookup): New, lookup a url in the registry.
+        * Modules/mediastream/MediaStream.h:
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::loadResource): Restructure and simplify the code that tries the 
+          different types of media engine so the code is easier to understand and modify.
+        (WebCore::HTMLMediaElement::createMediaPlayer): Clear m_mediaStreamSrcObject.
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::buildMediaEnginesVector): Add some whitespace to make it easier to read.
+        (WebCore::bestMediaEngineForSupportParameters): Also process mediastream and mediasource urls.
+        (WebCore::MediaPlayer::load): ASSERT if called when the reload timer is active.
+        (WebCore::MediaPlayer::loadWithNextMediaEngine): Also process mediastream and mediasource urls.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): Don't test empty/null urls.
+
+        * platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
+        (WebCore::MockMediaPlayerMediaSource::supportsType): Ditto.
+
 2015-09-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

@@ -2 +2 @@
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011, 2012, 2015 Ericsson AB. All rights reserved.
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -36 +36 @@
 #include "MediaStreamTrackEvent.h"
 #include "RealtimeMediaSource.h"
+#include "URL.h"
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
+
+static URLRegistry* s_registry;
+
+void MediaStream::setRegistry(URLRegistry& registry)
+{
+    ASSERT(!s_registry);
+    s_registry = &registry;
+}
+
+MediaStream* MediaStream::lookUp(const URL& url)
+{
+    if (!s_registry)
+        return nullptr;
+
+    return static_cast<MediaStream*>(s_registry->lookup(url.string()));
+}
 
 Ref<MediaStream> MediaStream::create(ScriptExecutionContext& context)

trunk/Source/WebCore/Modules/mediastream/MediaStream.h

@@ -2 +2 @@
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011, 2015 Ericsson AB. All rights reserved.
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -52 +52 @@
         virtual void didAddOrRemoveTrack() = 0;
     };
+
+    static void setRegistry(URLRegistry&);
+    static MediaStream* lookUp(const URL&);
 
     static Ref<MediaStream> create(ScriptExecutionContext&);

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1268 +1268 @@
     LOG(Media, "HTMLMediaElement::loadResource(%p) - m_currentSrc -> %s", this, urlForLoggingMedia(m_currentSrc).utf8().data());
 
-#if ENABLE(MEDIA_STREAM)
-    if (MediaStreamRegistry::registry().lookup(url.string()))
-        m_mediaSession->removeBehaviorRestriction(MediaElementSession::RequireUserGestureForRateChange);
-#endif
-
-    if (m_sendProgressEvents) 
+    if (m_sendProgressEvents)
         startProgressEventTimer();
 
@@ -1293 +1288 @@
     updateVolume();
 
+    bool loadAttempted = false;
 #if ENABLE(MEDIA_SOURCE)
     ASSERT(!m_mediaSource);
@@ -1308 +1304 @@
             mediaLoadingFailed(MediaPlayer::FormatError);
         }
-    } else
-#endif
+        loadAttempted = true;
+    }
+#endif
+
 #if ENABLE(MEDIA_STREAM)
-        if (m_mediaStreamSrcObject)
-            m_player->load(m_mediaStreamSrcObject->privateStream());
-        else
-#endif
-    if (!m_player->load(url, contentType, keySystem))
+    if (!loadAttempted) {
+        if (!m_mediaStreamSrcObject && url.protocolIs(mediaStreamBlobProtocol))
+            m_mediaStreamSrcObject = MediaStream::lookUp(url);
+
+        if (m_mediaStreamSrcObject) {
+            loadAttempted = true;
+            if (!m_player->load(m_mediaStreamSrcObject->privateStream()))
+                mediaLoadingFailed(MediaPlayer::FormatError);
+        }
+    }
+#endif
+
+    if (!loadAttempted && !m_player->load(url, contentType, keySystem))
         mediaLoadingFailed(MediaPlayer::FormatError);
 
@@ -5651 +5657 @@
 #endif
 
+#if ENABLE(MEDIA_STREAM)
+    m_mediaStreamSrcObject = nullptr;
+#endif
+
 #if ENABLE(VIDEO_TRACK)
     forgetResourceSpecificTracks();

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2007-2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64 +64 @@
 #if PLATFORM(COCOA)
 #include "MediaPlayerPrivateQTKit.h"
+
 #if USE(AVFOUNDATION)
 #include "MediaPlayerPrivateAVFoundationObjC.h"
-#if ENABLE(MEDIA_SOURCE)
+#endif
+
+#if ENABLE(MEDIA_SOURCE) && USE(AVFOUNDATION)
 #include "MediaPlayerPrivateMediaSourceAVFObjC.h"
 #endif
-#endif
-#elif PLATFORM(WIN) && !USE(GSTREAMER)
-#if USE(AVFOUNDATION)
+
+#endif // PLATFORM(COCOA)
+
+#if PLATFORM(WIN) && USE(AVFOUNDATION) && !USE(GSTREAMER)
 #include "MediaPlayerPrivateAVFoundationCF.h"
-#endif // USE(AVFOUNDATION)
 #endif
 
@@ -179 +182 @@
 #if USE(AVFOUNDATION)
     if (Settings::isAVFoundationEnabled()) {
+
 #if PLATFORM(COCOA)
         MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
+#endif
+
 #if ENABLE(MEDIA_SOURCE)
         MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine(addMediaEngine);
 #endif
-#elif PLATFORM(WIN)
+
+#if PLATFORM(WIN)
         MediaPlayerPrivateAVFoundationCF::registerMediaEngine(addMediaEngine);
 #endif
     }
-#endif
+#endif // USE(AVFOUNDATION)
 
 #if PLATFORM(MAC)
@@ -239 +246 @@
 static const MediaPlayerFactory* bestMediaEngineForSupportParameters(const MediaEngineSupportParameters& parameters, const MediaPlayerFactory* current = nullptr)
 {
-    if (parameters.type.isEmpty())
+    if (parameters.type.isEmpty() && !parameters.isMediaSource && !parameters.isMediaStream)
         return nullptr;
 
@@ -308 +315 @@
 bool MediaPlayer::load(const URL& url, const ContentType& contentType, const String& keySystem)
 {
+    ASSERT(!m_reloadTimer.isActive());
+
     m_contentMIMEType = contentType.type().lower();
     m_contentTypeCodecs = contentType.parameter(codecs());
@@ -346 +355 @@
 bool MediaPlayer::load(const URL& url, const ContentType& contentType, MediaSourcePrivateClient* mediaSource)
 {
+    ASSERT(!m_reloadTimer.isActive());
     ASSERT(mediaSource);
+
     m_mediaSource = mediaSource;
     m_contentMIMEType = contentType.type().lower();
@@ -361 +372 @@
 bool MediaPlayer::load(MediaStreamPrivate* mediaStream)
 {
+    ASSERT(!m_reloadTimer.isActive());
     ASSERT(mediaStream);
+
     m_mediaStream = mediaStream;
     m_keySystem = "";
@@ -392 +405 @@
 void MediaPlayer::loadWithNextMediaEngine(const MediaPlayerFactory* current)
 {
+#if ENABLE(MEDIA_SOURCE) 
+#define MEDIASOURCE m_mediaSource
+#else
+#define MEDIASOURCE 0
+#endif
+
+#if ENABLE(MEDIA_STREAM)
+#define MEDIASTREAM m_mediaStream
+#else
+#define MEDIASTREAM 0
+#endif
+
     const MediaPlayerFactory* engine = nullptr;
 
-    if (!m_contentMIMEType.isEmpty())
+    if (!m_contentMIMEType.isEmpty() || MEDIASTREAM || MEDIASOURCE)
         engine = nextBestMediaEngine(current);
 

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -104 +104 @@
 
 struct MediaEngineSupportParameters {
+
+    MediaEngineSupportParameters() { }
+
     String type;
     String codecs;
     URL url;
-#if ENABLE(ENCRYPTED_MEDIA)
     String keySystem;
-#endif
-#if ENABLE(MEDIA_SOURCE)
-    bool isMediaSource;
-#endif
-#if ENABLE(MEDIA_STREAM)
-    bool isMediaStream;
-#endif
-
-    MediaEngineSupportParameters()
-#if ENABLE(MEDIA_SOURCE)
-        : isMediaSource(false)
-#endif
-    {
-#if ENABLE(MEDIA_STREAM)
-        isMediaStream = false;
-#endif
-    }
+    bool isMediaSource { false };
+    bool isMediaStream { false };
 };
 

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

@@ -241 +241 @@
         return MediaPlayer::IsNotSupported;
 #endif
-    if (!mimeTypeCache().contains(parameters.type))
+
+    if (parameters.type.isEmpty() || !mimeTypeCache().contains(parameters.type))
         return MediaPlayer::IsNotSupported;
 

trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70 +70 @@
         return MediaPlayer::IsNotSupported;
 
-    if (!mimeTypeCache().contains(parameters.type))
+    if (parameters.type.isEmpty() || !mimeTypeCache().contains(parameters.type))
         return MediaPlayer::IsNotSupported;