Changeset 194918 in webkit

Timestamp:

Jan 12, 2016 12:20:13 PM (8 years ago)

Author:

adam.bergkvist@ericsson.com

Message:

WebRTC: Update RTCPeerConnection.add/removeTrack() and add test
​https://bugs.webkit.org/show_bug.cgi?id=153010

Reviewed by Eric Carlson.

Source/WebCore:

RTCPeerConnection.add/removeTrack() are not fully spec compliant yet, since that would
require support for RTCRtpTransceiver which is a new work-in-progress feature. Use
Vector, instead of map, for senders and receivers since nothing is removed from these
sets anymore.

Test: fast/mediastream/RTCPeerConnection-add-removeTrack.html

• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::addTrack):
(WebCore::RTCPeerConnection::removeTrack):
(WebCore::RTCPeerConnection::queuedCreateOffer): Deleted.

• Modules/mediastream/RTCPeerConnection.h:
• Modules/mediastream/RTCRtpSender.cpp:

(WebCore::RTCRtpSender::RTCRtpSender):

• Modules/mediastream/RTCRtpSender.h:

(WebCore::RTCRtpSender::create):
(WebCore::RTCRtpSender::mediaStreamIds):

LayoutTests:

Add test for RTCPeerConnection.add/removeTrack() (currently not covered by other tests).
This test also covers some of the functionality of RTCRtpSender.

• fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt: Added.
• fast/mediastream/RTCPeerConnection-add-removeTrack.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt (added)
• LayoutTests/fast/mediastream/RTCPeerConnection-add-removeTrack.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (modified) (4 diffs)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.h (modified) (4 diffs)
• Source/WebCore/Modules/mediastream/RTCRtpSender.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCRtpSender.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-12  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Update RTCPeerConnection.add/removeTrack() and add test
+        https://bugs.webkit.org/show_bug.cgi?id=153010
+
+        Reviewed by Eric Carlson.
+
+        Add test for RTCPeerConnection.add/removeTrack() (currently not covered by other tests).
+        This test also covers some of the functionality of RTCRtpSender.
+
+        * fast/mediastream/RTCPeerConnection-add-removeTrack-expected.txt: Added.
+        * fast/mediastream/RTCPeerConnection-add-removeTrack.html: Added.
+
 2016-01-12  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-12  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Update RTCPeerConnection.add/removeTrack() and add test
+        https://bugs.webkit.org/show_bug.cgi?id=153010
+
+        Reviewed by Eric Carlson.
+
+        RTCPeerConnection.add/removeTrack() are not fully spec compliant yet, since that would
+        require support for RTCRtpTransceiver which is a new work-in-progress feature. Use
+        Vector, instead of map, for senders and receivers since nothing is removed from these
+        sets anymore.
+
+        Test: fast/mediastream/RTCPeerConnection-add-removeTrack.html
+
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::addTrack):
+        (WebCore::RTCPeerConnection::removeTrack):
+        (WebCore::RTCPeerConnection::queuedCreateOffer): Deleted.
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/RTCRtpSender.cpp:
+        (WebCore::RTCRtpSender::RTCRtpSender):
+        * Modules/mediastream/RTCRtpSender.h:
+        (WebCore::RTCRtpSender::create):
+        (WebCore::RTCRtpSender::mediaStreamIds):
+
 2016-01-12  Brady Eidson  <beidson@apple.com>
 

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

@@ -50 +50 @@
 #include "RTCIceCandidateEvent.h"
 #include "RTCOfferAnswerOptions.h"
-#include "RTCRtpReceiver.h"
-#include "RTCRtpSender.h"
 #include "RTCSessionDescription.h"
 #include "RTCTrackEvent.h"
@@ -105 +103 @@
 }
 
-Vector<RefPtr<RTCRtpSender>> RTCPeerConnection::getSenders() const
-{
-    Vector<RefPtr<RTCRtpSender>> senders;
-    senders.reserveCapacity(m_senderSet.size());
-    copyValuesToVector(m_senderSet, senders);
-
-    return senders;
-}
-
-Vector<RefPtr<RTCRtpReceiver>> RTCPeerConnection::getReceivers() const
-{
-    Vector<RefPtr<RTCRtpReceiver>> receivers;
-    receivers.reserveCapacity(m_receiverSet.size());
-    copyValuesToVector(m_receiverSet, receivers);
-
-    return receivers;
-}
-
 RefPtr<RTCRtpSender> RTCPeerConnection::addTrack(RefPtr<MediaStreamTrack>&& track, Vector<MediaStream*> streams, ExceptionCode& ec)
 {
@@ -141 +121 @@
     }
 
-    if (m_senderSet.contains(track->id())) {
-        // FIXME: Spec says InvalidParameter
-        ec = INVALID_MODIFICATION_ERR;
-        return nullptr;
-    }
-
-    const String& trackId = track->id();
-    RefPtr<RTCRtpSender> sender = RTCRtpSender::create(WTFMove(track), streams[0]->id());
-    m_senderSet.add(trackId, sender);
+    for (auto& sender : m_senderSet) {
+        if (sender->track()->id() == track->id()) {
+            // FIXME: Spec says InvalidParameter
+            ec = INVALID_MODIFICATION_ERR;
+            return nullptr;
+        }
+    }
+
+    Vector<String> mediaStreamIds;
+    for (auto stream : streams)
+        mediaStreamIds.append(stream->id());
+
+    RefPtr<RTCRtpSender> sender = RTCRtpSender::create(WTFMove(track), WTFMove(mediaStreamIds));
+    m_senderSet.append(sender);
 
     m_backend->markAsNeedingNegotiation();
@@ -168 +153 @@
     }
 
-    if (!m_senderSet.remove(sender->track()->id()))
+    if (!m_senderSet.contains(sender))
         return;
 

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

@@ -42 +42 @@
 #include "JSMediaStream.h"
 #include "PeerConnectionBackend.h"
+#include "RTCRtpReceiver.h"
+#include "RTCRtpSender.h"
 #include "ScriptWrappable.h"
 #include <wtf/HashMap.h>
@@ -55 +57 @@
 class RTCIceCandidate;
 class RTCPeerConnectionErrorCallback;
-class RTCRtpReceiver;
-class RTCRtpSender;
 class RTCSessionDescription;
 class RTCStatsCallback;
@@ -65 +65 @@
     ~RTCPeerConnection();
 
-    Vector<RefPtr<RTCRtpSender>> getSenders() const override;
-    Vector<RefPtr<RTCRtpReceiver>> getReceivers() const;
+    Vector<RefPtr<RTCRtpSender>> getSenders() const override { return m_senderSet; }
+    Vector<RefPtr<RTCRtpReceiver>> getReceivers() const { return m_receiverSet; }
 
     RefPtr<RTCRtpSender> addTrack(RefPtr<MediaStreamTrack>&&, Vector<MediaStream*>, ExceptionCode&);
@@ -136 +136 @@
     PeerConnectionStates::IceConnectionState m_iceConnectionState;
 
-    HashMap<String, RefPtr<RTCRtpSender>> m_senderSet;
-    HashMap<String, RefPtr<RTCRtpReceiver>> m_receiverSet;
+    Vector<RefPtr<RTCRtpSender>> m_senderSet;
+    Vector<RefPtr<RTCRtpReceiver>> m_receiverSet;
 
     Vector<RefPtr<RTCDataChannel>> m_dataChannels;

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

@@ -36 +36 @@
 namespace WebCore {
 
-RTCRtpSender::RTCRtpSender(RefPtr<MediaStreamTrack>&& track, const String& mediaStreamId)
+RTCRtpSender::RTCRtpSender(RefPtr<MediaStreamTrack>&& track, Vector<String>&& mediaStreamIds)
     : RTCRtpSenderReceiverBase(WTFMove(track))
-    , m_mediaStreamId(mediaStreamId)
+    , m_mediaStreamIds(WTFMove(mediaStreamIds))
 {
 }

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

@@ -41 +41 @@
 class RTCRtpSender : public RTCRtpSenderReceiverBase {
 public:
-    static Ref<RTCRtpSender> create(RefPtr<MediaStreamTrack>&& track, const String& mediaStreamId)
+    static Ref<RTCRtpSender> create(RefPtr<MediaStreamTrack>&& track, Vector<String>&& mediaStreamIds)
     {
-        return adoptRef(*new RTCRtpSender(WTFMove(track), mediaStreamId));
+        return adoptRef(*new RTCRtpSender(WTFMove(track), WTFMove(mediaStreamIds)));
     }
 
-    const String& mediaStreamId() const { return m_mediaStreamId; }
+    const Vector<String>& mediaStreamIds() const { return m_mediaStreamIds; }
 
 private:
-    RTCRtpSender(RefPtr<MediaStreamTrack>&&, const String& mediaStreamId);
+    RTCRtpSender(RefPtr<MediaStreamTrack>&&, Vector<String>&& mediaStreamIds);
 
-    String m_mediaStreamId;
+    Vector<String> m_mediaStreamIds;
 };