Changeset 202376 in webkit

Timestamp:

Jun 23, 2016 6:52:13 AM (8 years ago)

Author:

adam.bergkvist@ericsson.com

Message:

WebRTC: Add support for RTCPeerConnection legacy MediaStream-based API
​https://bugs.webkit.org/show_bug.cgi?id=158940

Reviewed by Eric Carlson.

Source/WebCore:

Implement the legacy MediaStream-based RTCPeerConnection API as JS built-ins. The
getRemoteStreams() function and the 'addstream' event are partly implemented with native
code.

Test: fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html

• Modules/mediastream/MediaEndpointPeerConnection.cpp:

(WebCore::MediaEndpointPeerConnection::setRemoteDescriptionTask):
(WebCore::MediaEndpointPeerConnection::getRemoteStreams):
The getRemoteStreams() function and the 'addstream' event is backed up by native code.

• Modules/mediastream/MediaEndpointPeerConnection.h:
• Modules/mediastream/MediaStream.idl:
• Modules/mediastream/PeerConnectionBackend.h:
• Modules/mediastream/RTCPeerConnection.h:
• Modules/mediastream/RTCPeerConnection.idl:
• Modules/mediastream/RTCPeerConnection.js:

(initializeRTCPeerConnection):
(getLocalStreams):
(getRemoteStreams):
(getStreamById):
(addStream):
(removeStream):
Legacy API implemented as JS built-ins.

• bindings/js/JSDOMGlobalObject.cpp:

(WebCore::JSDOMGlobalObject::addBuiltinGlobals):

• bindings/js/WebCoreBuiltinNames.h:

LayoutTests:

Add test for RTCPeerConnection legacy MediaStream-based API.

• fast/mediastream/RTCPeerConnection-legacy-stream-based-api-expected.txt: Added.
• fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html: Added.
• platform/mac/TestExpectations:

Skip test for mac port (not building with WEB_RTC yet)

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-legacy-stream-based-api-expected.txt (added)
• LayoutTests/fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (modified) (5 diffs)
• Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStream.idl (modified) (1 diff)
• Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.js (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (modified) (2 diffs)
• Source/WebCore/bindings/js/WebCoreBuiltinNames.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-23  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Add support for RTCPeerConnection legacy MediaStream-based API
+        https://bugs.webkit.org/show_bug.cgi?id=158940
+
+        Reviewed by Eric Carlson.
+
+        Add test for RTCPeerConnection legacy MediaStream-based API.
+
+        * fast/mediastream/RTCPeerConnection-legacy-stream-based-api-expected.txt: Added.
+        * fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html: Added.
+        * platform/mac/TestExpectations:
+        Skip test for mac port (not building with WEB_RTC yet)
+
 2016-06-23  Per Arne Vollan  <pvollan@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -205 +205 @@
 fast/mediastream/RTCPeerConnection-media-setup-two-dialogs.html
 fast/mediastream/RTCPeerConnection-media-setup-callbacks-single-dialog.html
+fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html
 
 # Asserts in debug.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-23  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Add support for RTCPeerConnection legacy MediaStream-based API
+        https://bugs.webkit.org/show_bug.cgi?id=158940
+
+        Reviewed by Eric Carlson.
+
+        Implement the legacy MediaStream-based RTCPeerConnection API as JS built-ins. The
+        getRemoteStreams() function and the 'addstream' event are partly implemented with native
+        code.
+
+        Test: fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html
+
+        * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+        (WebCore::MediaEndpointPeerConnection::setRemoteDescriptionTask):
+        (WebCore::MediaEndpointPeerConnection::getRemoteStreams):
+        The getRemoteStreams() function and the 'addstream' event is backed up by native code.
+        * Modules/mediastream/MediaEndpointPeerConnection.h:
+        * Modules/mediastream/MediaStream.idl:
+        * Modules/mediastream/PeerConnectionBackend.h:
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/RTCPeerConnection.idl:
+        * Modules/mediastream/RTCPeerConnection.js:
+        (initializeRTCPeerConnection):
+        (getLocalStreams):
+        (getRemoteStreams):
+        (getStreamById):
+        (addStream):
+        (removeStream):
+        Legacy API implemented as JS built-ins.
+        * bindings/js/JSDOMGlobalObject.cpp:
+        (WebCore::JSDOMGlobalObject::addBuiltinGlobals):
+        * bindings/js/WebCoreBuiltinNames.h:
+
 2016-06-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -38 +38 @@
 #include "MediaEndpointSessionConfiguration.h"
 #include "MediaStream.h"
+#include "MediaStreamEvent.h"
 #include "MediaStreamTrack.h"
 #include "PeerMediaDescription.h"
@@ -476 +477 @@
         return;
     }
+
+    // One legacy MediaStreamEvent will be fired for every new MediaStream created as this remote description is set.
+    Vector<RefPtr<MediaStreamEvent>> legacyMediaStreamEvents;
 
     for (auto mediaDescription : mediaDescriptions) {
@@ -530 +534 @@
                     auto newStream = MediaStream::create(*m_client->scriptExecutionContext(), MediaStreamTrackVector({ receiver.track() }));
                     m_remoteStreamMap.add(id, newStream.copyRef());
+                    legacyMediaStreamEvents.append(MediaStreamEvent::create(eventNames().addstreamEvent, false, false, newStream.copyRef()));
                     trackEventMediaStreams.add(id, WTFMove(newStream));
                 }
@@ -541 +546 @@
         }
     }
+
+    // Fire legacy addstream events.
+    for (auto& event : legacyMediaStreamEvents)
+        m_client->fireEvent(*event);
 
     SignalingState newSignalingState;
@@ -670 +679 @@
 
     promise.reject(NOT_SUPPORTED_ERR);
+}
+
+Vector<RefPtr<MediaStream>> MediaEndpointPeerConnection::getRemoteStreams() const
+{
+    Vector<RefPtr<MediaStream>> remoteStreams;
+    copyValuesToVector(m_remoteStreamMap, remoteStreams);
+    return remoteStreams;
 }
 

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

@@ -74 +74 @@
     void getStats(MediaStreamTrack*, PeerConnection::StatsPromise&&) override;
 
+    Vector<RefPtr<MediaStream>> getRemoteStreams() const override;
+
     RefPtr<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) override;
     void replaceTrack(RTCRtpSender&, RefPtr<MediaStreamTrack>&&, PeerConnection::VoidPromise&&) override;

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

@@ -35 +35 @@
     sequence<MediaStreamTrack> getAudioTracks();
     sequence<MediaStreamTrack> getVideoTracks();
-    sequence<MediaStreamTrack> getTracks();
+    [PrivateIdentifier, PublicIdentifier] sequence<MediaStreamTrack> getTracks();
     MediaStreamTrack getTrackById(DOMString trackId);
 

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

@@ -41 +41 @@
 class DOMError;
 class Event;
+class MediaStream;
 class MediaStreamTrack;
 class PeerConnectionBackend;
@@ -107 +108 @@
     virtual void getStats(MediaStreamTrack*, PeerConnection::StatsPromise&&) = 0;
 
+    virtual Vector<RefPtr<MediaStream>> getRemoteStreams() const = 0;
+
     virtual RefPtr<RTCRtpReceiver> createReceiver(const String& transceiverMid, const String& trackKind, const String& trackId) = 0;
     virtual void replaceTrack(RTCRtpSender&, RefPtr<MediaStreamTrack>&&, PeerConnection::VoidPromise&&) = 0;

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

@@ -69 +69 @@
     const Vector<RefPtr<RTCRtpReceiver>>& getReceivers() const { return m_transceiverSet->getReceivers(); }
     const Vector<RefPtr<RTCRtpTransceiver>>& getTransceivers() const override { return m_transceiverSet->list(); }
+
+    // Part of legacy MediaStream-based API (mostly implemented as JS built-ins)
+    Vector<RefPtr<MediaStream>> getRemoteStreams() const { return m_backend->getRemoteStreams(); }
 
     RefPtr<RTCRtpSender> addTrack(Ref<MediaStreamTrack>&&, const Vector<MediaStream*>&, ExceptionCode&);

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl

@@ -42 +42 @@
 
     // RTP Media API extensions
-    sequence<RTCRtpSender> getSenders();
+    [PrivateIdentifier, PublicIdentifier] sequence<RTCRtpSender> getSenders();
     sequence<RTCRtpReceiver> getReceivers();
     sequence<RTCRtpTransceiver> getTransceivers();
 
-    [StrictTypeChecking, RaisesException] RTCRtpSender addTrack(MediaStreamTrack track, MediaStream... streams);
-    [StrictTypeChecking, RaisesException] void removeTrack(RTCRtpSender sender);
+    [PrivateIdentifier, PublicIdentifier, StrictTypeChecking, RaisesException] RTCRtpSender addTrack(MediaStreamTrack track, MediaStream... streams);
+    [PrivateIdentifier, PublicIdentifier, StrictTypeChecking, RaisesException] void removeTrack(RTCRtpSender sender);
 
     [StrictTypeChecking, RaisesException] RTCRtpTransceiver addTransceiver(MediaStreamTrack track, optional RTCRtpTransceiverInit init);
     [StrictTypeChecking, RaisesException] RTCRtpTransceiver addTransceiver(DOMString kind, optional RTCRtpTransceiverInit init);
+
+    // Legacy MediaSream-based API (implemented on top of the RTP Media API)
+    [JSBuiltin] sequence<MediaStream> getLocalStreams();
+    [PrivateIdentifier, PublicIdentifier] sequence<MediaStream> getRemoteStreams();
+    [JSBuiltin] MediaStream getStreamById(DOMString streamId);
+
+    [JSBuiltin] void addStream(MediaStream stream);
+    [JSBuiltin] void removeStream(MediaStream stream);
 
     [JSBuiltin] Promise createOffer(optional Dictionary offerOptions);
@@ -118 +126 @@
     attribute EventHandler onicegatheringstatechange;
     attribute EventHandler ondatachannel;
+
+    // Legacy event handler (MediaStream-based API)
+    attribute EventHandler onaddstream;
 };
 

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js

@@ -49 +49 @@
         throw new @TypeError(message);
     }
+
+    this.@localStreams = [];
+
     return this;
+}
+
+function getLocalStreams()
+{
+    "use strict";
+
+    if (!@isRTCPeerConnection(this))
+        throw new @TypeError("Function should be called on an RTCPeerConnection");
+
+    return this.@localStreams.slice();
+}
+
+function getStreamById(streamIdArg)
+{
+    "use strict";
+
+    if (!@isRTCPeerConnection(this))
+        throw new @TypeError("Function should be called on an RTCPeerConnection");
+
+    if (arguments.length < 1)
+        throw new @TypeError("Not enough arguments");
+
+    const streamId = @String(streamIdArg);
+
+    return this.@localStreams.find(stream => stream.id === streamId)
+        || this.@getRemoteStreams().find(stream => stream.id === streamId)
+        || null;
+}
+
+function addStream(stream)
+{
+    "use strict";
+
+    if (!@isRTCPeerConnection(this))
+        throw new @TypeError("Function should be called on an RTCPeerConnection");
+
+    if (arguments.length < 1)
+        throw new @TypeError("Not enough arguments");
+
+    if (!(stream instanceof @MediaStream))
+        throw new @TypeError("Argument 1 ('stream') to RTCPeerConnection.addStream must be an instance of MediaStream");
+
+    if (this.@localStreams.find(localStream => localStream.id === stream.id))
+        return;
+
+    this.@localStreams.@push(stream);
+    stream.@getTracks().forEach(track => this.@addTrack(track, stream));
+}
+
+function removeStream(stream)
+{
+    "use strict";
+
+    if (!@isRTCPeerConnection(this))
+        throw new @TypeError("Function should be called on an RTCPeerConnection");
+
+    if (arguments.length < 1)
+        throw new @TypeError("Not enough arguments");
+
+    if (!(stream instanceof @MediaStream))
+        throw new @TypeError("Argument 1 ('stream') to RTCPeerConnection.removeStream must be an instance of MediaStream");
+
+    const indexOfStreamToRemove = this.@localStreams.findIndex(localStream => localStream.id === stream.id);
+    if (indexOfStreamToRemove === -1)
+        return;
+
+    const senders = this.@getSenders();
+    this.@localStreams[indexOfStreamToRemove].@getTracks().forEach(track => {
+        const senderForTrack = senders.find(sender => sender.track && sender.track.id === track.id);
+        if (senderForTrack)
+            this.@removeTrack(senderForTrack);
+    });
+
+    this.@localStreams.splice(indexOfStreamToRemove, 1);
 }
 

trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp

@@ -31 +31 @@
 #include "JSDOMWindow.h"
 #include "JSEventListener.h"
+#include "JSMediaStream.h"
 #include "JSMediaStreamTrack.h"
 #include "JSRTCIceCandidate.h"
@@ -84 +85 @@
         JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamWritablePrivateName(), jsNumber(6), DontDelete | ReadOnly),
 #if ENABLE(MEDIA_STREAM)
+        JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().MediaStreamPrivateName(), JSMediaStream::getConstructor(vm, this), DontDelete | ReadOnly),
         JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().MediaStreamTrackPrivateName(), JSMediaStreamTrack::getConstructor(vm, this), DontDelete | ReadOnly),
 #endif

trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h

@@ -33 +33 @@
 
 #define WEBCORE_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(macro)\
+    macro(addTrack) \
     macro(appendFromJS) \
     macro(closeRequested) \
@@ -41 +42 @@
     macro(fillFromJS) \
     macro(getUserMediaFromJS) \
+    macro(getRemoteStreams) \
+    macro(getSenders) \
+    macro(getTracks) \
     macro(initializeWith) \
+    macro(localStreams) \
     macro(operations) \
     macro(ownerReadableStream) \
@@ -56 +61 @@
     macro(readRequests) \
     macro(readyPromiseCapability) \
+    macro(removeTrack) \
     macro(state) \
     macro(started) \
@@ -70 +76 @@
     macro(underlyingSource) \
     macro(writing) \
+    macro(MediaStream) \
     macro(MediaStreamTrack) \
     macro(ReadableStream) \