Changeset 202624 in webkit

Timestamp:

Jun 29, 2016 9:10:44 AM (8 years ago)

Author:

adam.bergkvist@ericsson.com

Message:

REGRESSION(r202337) [WebRTC] Crash when loading html5test.com
​https://bugs.webkit.org/show_bug.cgi?id=159145

Reviewed by Eric Carlson.

MediaEndpointPeerConnection uses an implementation of the MediaEndpoint interface to
interact with the port's WebRTC backend. A mock (MockMediaEndpoint) is used for testing.
This change adds an "empty" MediaEndpoint implementation that simplifies the case when a
port builds and tests with MediaEndpointPeerConnection/MockMediaEndpoint, but doesn't have
a "real" MediaEndpoint implementation yet (to use with MiniBrowser).

• Modules/mediastream/MediaEndpointPeerConnection.cpp:

(WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection):

• platform/mediastream/MediaEndpoint.cpp:

(WebCore::EmptyRealtimeMediaSource::create):
(WebCore::EmptyRealtimeMediaSource::EmptyRealtimeMediaSource):
(WebCore::EmptyMediaEndpoint::EmptyMediaEndpoint):
(WebCore::createMediaEndpoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaEndpointPeerConnection.cpp (modified) (2 diffs)
• platform/mediastream/MediaEndpoint.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-29  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        REGRESSION(r202337) [WebRTC] Crash when loading html5test.com
+        https://bugs.webkit.org/show_bug.cgi?id=159145
+
+        Reviewed by Eric Carlson.
+
+        MediaEndpointPeerConnection uses an implementation of the MediaEndpoint interface to
+        interact with the port's WebRTC backend. A mock (MockMediaEndpoint) is used for testing.
+        This change adds an "empty" MediaEndpoint implementation that simplifies the case when a
+        port builds and tests with MediaEndpointPeerConnection/MockMediaEndpoint, but doesn't have
+        a "real" MediaEndpoint implementation yet (to use with MiniBrowser).
+
+        * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+        (WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection):
+        * platform/mediastream/MediaEndpoint.cpp:
+        (WebCore::EmptyRealtimeMediaSource::create):
+        (WebCore::EmptyRealtimeMediaSource::EmptyRealtimeMediaSource):
+        (WebCore::EmptyMediaEndpoint::EmptyMediaEndpoint):
+        (WebCore::createMediaEndpoint):
+
 2016-06-29  Alejandro G. Castro  <alex@igalia.com>
 

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

@@ -71 +71 @@
 MediaEndpointPeerConnection::MediaEndpointPeerConnection(PeerConnectionBackendClient* client)
     : m_client(client)
+    , m_mediaEndpoint(MediaEndpoint::create(*this))
     , m_sdpProcessor(std::unique_ptr<SDPProcessor>(new SDPProcessor(m_client->scriptExecutionContext())))
     , m_cname(randomString(16))
@@ -76 +77 @@
     , m_icePassword(randomString(22))
 {
-    m_mediaEndpoint = MediaEndpoint::create(*this);
     ASSERT(m_mediaEndpoint);
 

trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp

@@ -34 +34 @@
 #include "MediaEndpoint.h"
 
+#include "MediaPayload.h"
+#include "RealtimeMediaSource.h"
+
 namespace WebCore {
 
-static std::unique_ptr<MediaEndpoint> createMediaEndpoint(MediaEndpointClient&)
+class EmptyRealtimeMediaSource : public RealtimeMediaSource {
+public:
+    static Ref<EmptyRealtimeMediaSource> create() { return adoptRef(*new EmptyRealtimeMediaSource()); }
+
+    RefPtr<RealtimeMediaSourceCapabilities> capabilities() override { return nullptr; }
+    const RealtimeMediaSourceSettings& settings() override { return m_sourceSettings; }
+
+private:
+    EmptyRealtimeMediaSource()
+        : RealtimeMediaSource(emptyString(), RealtimeMediaSource::None, emptyString())
+        { }
+
+    RealtimeMediaSourceSettings m_sourceSettings;
+};
+
+class EmptyMediaEndpoint : public MediaEndpoint {
+public:
+    EmptyMediaEndpoint(MediaEndpointClient&) { }
+
+    void setConfiguration(RefPtr<MediaEndpointConfiguration>&&) override { }
+
+    void generateDtlsInfo() override { }
+    MediaPayloadVector getDefaultAudioPayloads() override { return MediaPayloadVector(); }
+    MediaPayloadVector getDefaultVideoPayloads() override { return MediaPayloadVector(); }
+    MediaPayloadVector filterPayloads(const MediaPayloadVector&, const MediaPayloadVector&) override { return MediaPayloadVector(); }
+
+    UpdateResult updateReceiveConfiguration(MediaEndpointSessionConfiguration*, bool) override { return UpdateResult::Failed; }
+    UpdateResult updateSendConfiguration(MediaEndpointSessionConfiguration*, const RealtimeMediaSourceMap&, bool) override { return UpdateResult::Failed; }
+
+    void addRemoteCandidate(IceCandidate&, const String&, const String&, const String&) override { }
+
+    Ref<RealtimeMediaSource> createMutedRemoteSource(const String&, RealtimeMediaSource::Type) override { return EmptyRealtimeMediaSource::create(); }
+    void replaceSendSource(RealtimeMediaSource&, const String&) override { }
+
+    void stop() override { }
+};
+
+static std::unique_ptr<MediaEndpoint> createMediaEndpoint(MediaEndpointClient& client)
 {
-    return nullptr;
+    return std::make_unique<EmptyMediaEndpoint>(client);
 }