Changeset 201728 in webkit

Timestamp:

Jun 6, 2016 2:40:58 PM (8 years ago)

Author:

adam.bergkvist@ericsson.com

Message:

WebRTC: Update MediaEndpointPeerConnection::createOffer() to use the transceiver set
​https://bugs.webkit.org/show_bug.cgi?id=158203

Reviewed by Eric Carlson.

Source/WebCore:

Create an SDP offer based on the RTCPeerConnection object's set of RTCRtpTransceiver objects
(instead of RTCRtpSender objects).

Updated existing test: fast/mediastream/RTCPeerConnection-inspect-offer.html

• Modules/mediastream/MediaEndpointPeerConnection.cpp:

(WebCore::matchTransceiver):
(WebCore::matchTransceiverByMid):
(WebCore::MediaEndpointPeerConnection::createOfferTask):

• Modules/mediastream/MediaEndpointPeerConnection.h:
• Modules/mediastream/PeerConnectionBackend.h:

Remove getSenders() which is replaced by getTransceivers().

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

(WebCore::configurationFromJSON):
(WebCore::configurationToJSON):

• Modules/mediastream/sdp.js:

(SDP.parse):
(SDP.generate):
Add support for mid attribute.

• platform/mediastream/PeerMediaDescription.h:

(WebCore::PeerMediaDescription::mid):
(WebCore::PeerMediaDescription::setMid):
(WebCore::PeerMediaDescription::clone):

LayoutTests:

Updated existing test.

• fast/mediastream/RTCPeerConnection-inspect-offer-expected.txt:
• fast/mediastream/RTCPeerConnection-inspect-offer.html:

Add verification of mid attribute [1] (corresponds to the RTCRtpTransceiver mid attribute).
[1] ​https://tools.ietf.org/html/rfc5888

• fast/mediastream/resources/sdp-utils.js: Added.

(printComparableSessionDescription):
(verified):
(match):
Move the printComparableSessionDescription function to a separate file
to make it usable in other (future) tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer-expected.txt (modified) (3 diffs)
• LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer.html (modified) (2 diffs)
• LayoutTests/fast/mediastream/resources/sdp-utils.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (modified) (4 diffs)
• Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/SDPProcessor.cpp (modified) (3 diffs)
• Source/WebCore/Modules/mediastream/sdp.js (modified) (5 diffs)
• Source/WebCore/platform/mediastream/PeerMediaDescription.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-06  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Update MediaEndpointPeerConnection::createOffer() to use the transceiver set
+        https://bugs.webkit.org/show_bug.cgi?id=158203
+
+        Reviewed by Eric Carlson.
+
+        Updated existing test.
+
+        * fast/mediastream/RTCPeerConnection-inspect-offer-expected.txt:
+        * fast/mediastream/RTCPeerConnection-inspect-offer.html:
+        Add verification of mid attribute [1] (corresponds to the RTCRtpTransceiver mid attribute).
+        [1] https://tools.ietf.org/html/rfc5888
+        * fast/mediastream/resources/sdp-utils.js: Added.
+        (printComparableSessionDescription):
+        (verified):
+        (match):
+        Move the printComparableSessionDescription function to a separate file
+        to make it usable in other (future) tests.
+
 2016-06-06  Antoine Quint  <graouts@apple.com>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer-expected.txt

@@ -16 +16 @@
 a=rtcp-mux
 a=sendrecv
+a=mid:{mid:OK}
 a=rtpmap:111 OPUS/48000/2
 a=rtpmap:8 PCMA/8000
@@ -39 +40 @@
 a=rtcp-mux
 a=sendrecv
+a=mid:{mid:OK}
 a=rtpmap:111 OPUS/48000/2
 a=rtpmap:8 PCMA/8000
@@ -52 +54 @@
 a=rtcp-mux
 a=sendrecv
+a=mid:{mid:OK}
 a=rtpmap:103 H264/90000
 a=rtpmap:100 VP8/90000

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-inspect-offer.html

@@ -3 +3 @@
     <head>
         <script src="../../resources/js-test-pre.js"></script>
+        <script src="./resources/sdp-utils.js"></script>
     </head>
     <body>
@@ -52 +53 @@
             });
 
-            // Variable fields (e.g. generated ids) are verified and replaced with predictable
-            // lables. The result can be compared with a predefined expected output.
-            function printComparableSessionDescription(sessionDescription, mdescVariables) {
-                debug("=== RTCSessionDescription ===");
-                debug("type: " + sessionDescription.type + ", sdp:");
-
-                var sdp = sessionDescription.sdp;
-
-                var regexp = {
-                    "oline": "^o=(-) ([\\d]+) .*$",
-                    "msidsemantic": "^a=msid-semantic: *WMS .*$",
-                    "mline": "^m=.*$",
-                    "cname": "^a=ssrc:(\\d+) cname:([\\w+/\\-@\\.\\{\\}]+).*$",
-                    "msid": "^a=(ssrc:\\d+ )?msid:([\\w+/\\-=]+) +([\\w+/\\-=]+).*$",
-                    "iceufrag": "^a=ice-ufrag:([\\w+/]*).*$",
-                    "icepwd": "^a=ice-pwd:([\\w+/]*=*).*$",
-                };
-
-                var mdescIndex = -1;
-                sdp.split("\r\n").forEach(function (line) {
-                    if (match(line, regexp.mline)) {
-                        // Media block ("header" line)
-                        mdescIndex++;
-                    } else if (mdescIndex < 0) {
-                        // Session block
-                        var oline;
-
-                        if (oline = match(line, regexp.oline))
-                            line = line.replace(oline[2], verified("session-id"));
-                        else if (match(line, regexp.msidsemantic)) {
-                            mdescVariables.forEach(function (variables) {
-                                line = line.replace(variables.streamId, verified("media-stream-id"));
-                            });
-                        }
-                    } else {
-                        // Media block (content lines)
-                        var cname;
-                        var msid;
-                        var iceufrag;
-                        var icepwd;
-
-                        if (cname = match(line, regexp.cname)) {
-                            line = line.replace(cname[1], verified("ssrc"));
-                            line = line.replace(cname[2], verified("cname"));
-
-                        } else if (msid = match(line, regexp.msid)) {
-                            if (msid[1])
-                                line = line.replace(msid[1], verified("ssrc"));
-
-                            var variables = mdescVariables[mdescIndex];
-
-                            var mediaStreamId = msid[2];
-                            var streamIdVerified = verified("media-stream-id", mediaStreamId != variables.streamId);
-                            line = line.replace(mediaStreamId, streamIdVerified);
-
-                            var mediaStreamTrackId = msid[3];
-                            var trackIdVerified = verified("media-stream-track-id", mediaStreamTrackId != variables.trackId);
-                            line = line.replace(mediaStreamTrackId, trackIdVerified);
-
-                        } else if (iceufrag = match(line, regexp.iceufrag))
-                            line = line.replace(iceufrag[1], verified("ice-ufrag"));
-                        else if (icepwd = match(line, regexp.icepwd))
-                            line = line.replace(icepwd[1], verified("ice-password"));
-                    }
-
-                    if (line)
-                        debug(line);
-                });
-
-                debug("===");
-                debug("");
-            }
-
-            function verified(name, isFailure) {
-                return "{" + name + ":" + (isFailure ? "FAILED" : "OK") + "}";
-            }
-
-            function match(data, pattern) {
-                return data.match(new RegExp(pattern));
-            }
-
             window.jsTestIsAsync = true;
             window.successfullyParsed = true;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-06  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Update MediaEndpointPeerConnection::createOffer() to use the transceiver set
+        https://bugs.webkit.org/show_bug.cgi?id=158203
+
+        Reviewed by Eric Carlson.
+
+        Create an SDP offer based on the RTCPeerConnection object's set of RTCRtpTransceiver objects
+        (instead of RTCRtpSender objects).
+
+        Updated existing test: fast/mediastream/RTCPeerConnection-inspect-offer.html
+
+        * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+        (WebCore::matchTransceiver):
+        (WebCore::matchTransceiverByMid):
+        (WebCore::MediaEndpointPeerConnection::createOfferTask):
+        * Modules/mediastream/MediaEndpointPeerConnection.h:
+        * Modules/mediastream/PeerConnectionBackend.h:
+        Remove getSenders() which is replaced by getTransceivers().
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/SDPProcessor.cpp:
+        (WebCore::configurationFromJSON):
+        (WebCore::configurationToJSON):
+        * Modules/mediastream/sdp.js:
+        (SDP.parse):
+        (SDP.generate):
+        Add support for mid attribute.
+        * platform/mediastream/PeerMediaDescription.h:
+        (WebCore::PeerMediaDescription::mid):
+        (WebCore::PeerMediaDescription::setMid):
+        (WebCore::PeerMediaDescription::clone):
+
 2016-06-06  George Ruan  <gruan@apple.com>
 

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

@@ -46 +46 @@
 
 using namespace PeerConnection;
+using namespace PeerConnectionStates;
 
 static std::unique_ptr<PeerConnectionBackend> createMediaEndpointPeerConnection(PeerConnectionBackendClient* client)
@@ -96 +97 @@
 }
 
+static RTCRtpTransceiver* matchTransceiver(const RtpTransceiverVector& transceivers, const std::function<bool(RTCRtpTransceiver&)>& matchFunction)
+{
+    for (auto& transceiver : transceivers) {
+        if (matchFunction(*transceiver))
+            return transceiver.get();
+    }
+    return nullptr;
+}
+
+static RTCRtpTransceiver* matchTransceiverByMid(const RtpTransceiverVector& transceivers, const String& mid)
+{
+    return matchTransceiver(transceivers, [&mid] (RTCRtpTransceiver& current) {
+        return current.mid() == mid;
+    });
+}
+
 void MediaEndpointPeerConnection::runTask(NoncopyableFunction<void ()>&& task)
 {
@@ -129 +146 @@
     ASSERT(!m_dtlsFingerprint.isEmpty());
 
+    if (m_client->internalSignalingState() == SignalingState::Closed)
+        return;
+
     RefPtr<MediaEndpointSessionConfiguration> configurationSnapshot = MediaEndpointSessionConfiguration::create();
 
-    configurationSnapshot->setSessionVersion(m_sdpSessionVersion++);
-
-    RtpSenderVector senders = RtpSenderVector(m_client->getSenders());
-
-    // Add media descriptions for senders.
-    for (auto& sender : senders) {
+    configurationSnapshot->setSessionVersion(m_sdpOfferSessionVersion++);
+
+    auto transceivers = RtpTransceiverVector(m_client->getTransceivers());
+
+    // Remove any transceiver objects from transceivers that can be matched to an existing media description.
+    for (auto& mediaDescription : configurationSnapshot->mediaDescriptions()) {
+        if (!mediaDescription->port()) {
+            // This media description should be recycled.
+            continue;
+        }
+
+        RTCRtpTransceiver* transceiver = matchTransceiverByMid(transceivers, mediaDescription->mid());
+        if (!transceiver)
+            continue;
+
+        mediaDescription->setMode(transceiver->directionString());
+        if (transceiver->hasSendingDirection()) {
+            RTCRtpSender& sender = *transceiver->sender();
+
+            mediaDescription->setMediaStreamId(sender.mediaStreamIds()[0]);
+            mediaDescription->setMediaStreamTrackId(sender.trackId());
+        }
+
+        transceivers.removeFirst(transceiver);
+    }
+
+    // Add media descriptions for remaining transceivers.
+    for (auto& transceiver : transceivers) {
         RefPtr<PeerMediaDescription> mediaDescription = PeerMediaDescription::create();
-        MediaStreamTrack& track = *sender->track();
-
-        mediaDescription->setMediaStreamId(sender->mediaStreamIds()[0]);
-        mediaDescription->setMediaStreamTrackId(track.id());
-        mediaDescription->setType(track.kind());
-        mediaDescription->setPayloads(track.kind() == "audio" ? m_defaultAudioPayloads : m_defaultVideoPayloads);
+        RTCRtpSender& sender = *transceiver->sender();
+
+        mediaDescription->setMode(transceiver->directionString());
+        mediaDescription->setMid(transceiver->provisionalMid());
+        mediaDescription->setMediaStreamId(sender.mediaStreamIds()[0]);
+        mediaDescription->setType(sender.trackKind());
+        mediaDescription->setPayloads(sender.trackKind() == "audio" ? m_defaultAudioPayloads : m_defaultVideoPayloads);
         mediaDescription->setDtlsFingerprintHashFunction(m_dtlsFingerprintFunction);
         mediaDescription->setDtlsFingerprint(m_dtlsFingerprint);
@@ -151 +194 @@
         mediaDescription->setIcePassword(m_icePassword);
 
+        if (sender.track())
+            mediaDescription->setMediaStreamTrackId(sender.trackId());
+
         configurationSnapshot->addMediaDescription(WTFMove(mediaDescription));
     }

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

@@ -47 +47 @@
 
 typedef Vector<RefPtr<RTCRtpSender>> RtpSenderVector;
+typedef Vector<RefPtr<RTCRtpTransceiver>> RtpTransceiverVector;
 
 class MediaEndpointPeerConnection : public PeerConnectionBackend, public MediaEndpointClient {
@@ -106 +107 @@
     String m_dtlsFingerprint;
     String m_dtlsFingerprintFunction;
-    unsigned m_sdpSessionVersion { 0 };
+    unsigned m_sdpOfferSessionVersion { 0 };
 };
 

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

@@ -63 +63 @@
 public:
     virtual const Vector<RefPtr<RTCRtpTransceiver>>& getTransceivers() const = 0;
-    virtual const Vector<RefPtr<RTCRtpSender>>& getSenders() const = 0;
     virtual void fireEvent(Event&) = 0;
 

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

@@ -64 +64 @@
     ~RTCPeerConnection();
 
-    const Vector<RefPtr<RTCRtpSender>>& getSenders() const override { return m_transceiverSet->getSenders(); }
+    const Vector<RefPtr<RTCRtpSender>>& getSenders() const { return m_transceiverSet->getSenders(); }
     const Vector<RefPtr<RTCRtpReceiver>>& getReceivers() const { return m_transceiverSet->getReceivers(); }
     const Vector<RefPtr<RTCRtpTransceiver>>& getTransceivers() const override { return m_transceiverSet->list(); }

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

@@ -71 +71 @@
 STRING_FUNCTION(mediaStreamId)
 STRING_FUNCTION(mediaStreamTrackId)
+STRING_FUNCTION(mid)
 STRING_FUNCTION(mode)
 STRING_FUNCTION(mux)
@@ -212 +213 @@
             mediaDescription->setMode(stringValue);
 
+        if (mediaDescriptionObject->getString(midString(), stringValue))
+            mediaDescription->setMid(stringValue);
+
         RefPtr<InspectorArray> payloadsArray = InspectorArray::create();
         mediaDescriptionObject->getArray(payloadsString(), payloadsArray);
@@ -354 +358 @@
         mediaDescriptionObject->setString(addressString(), mediaDescription->address());
         mediaDescriptionObject->setString(modeString(), mediaDescription->mode());
+        mediaDescriptionObject->setString(midString(), mediaDescription->mid());
 
         RefPtr<InspectorArray> payloadsArray = InspectorArray::create();

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

@@ -41 +41 @@
         "mblock": "^m=(audio|video|application) ([\\d]+) ([A-Z/]+)([\\d ]*)$\\r?\\n",
         "mode": "^a=(sendrecv|sendonly|recvonly|inactive).*$",
+        "mid": "^a=mid:([!#$%&'*+-.\\w]*).*$",
         "rtpmap": "^a=rtpmap:${type} ([\\w\\-]+)/([\\d]+)/?([\\d]+)?.*$",
-        "fmtp": "^a=fmtp:${type} ([\\w\\-=;]+).*$",
+        "fmtp": "^a=fmtp:${type} ([\\w\\-=; ]+).*$",
         "param": "([\\w\\-]+)=([\\w\\-]+);?",
         "nack": "^a=rtcp-fb:${type} nack$",
@@ -78 +79 @@
             "${rtcpMuxLine}" +
             "a=${mode}\r\n" +
+            "${midLine}" +
             "${rtpMapLines}" +
             "${fmtpLines}" +
@@ -94 +96 @@
         "rtcp": "a=rtcp:${port}${[ ]netType}${[ ]addressType}${[ ]address}\r\n",
         "rtcpMux": "a=rtcp-mux\r\n",
+        "mid": "a=mid:${mid}\r\n",
 
         "rtpMap": "a=rtpmap:${type} ${encodingName}/${clockRate}${[/]channels}\r\n",
@@ -202 +205 @@
             if (mode)
                 mediaDescription.mode = mode[1];
+
+            var mid = match(mblock, regexps.mid, "m", sblock);
+            if (mid)
+                mediaDescription.mid = mid[1];
 
             var payloadTypes = [];
@@ -406 +413 @@
             var mblock = fillTemplate(templates.mblock, mediaDescription);
 
+            var midInfo = {"midLine": ""};
+            if (mediaDescription.mid)
+                midInfo.midLine = fillTemplate(templates.mid, mediaDescription);
+            mblock = fillTemplate(mblock, midInfo);
+
             var payloadInfo = {"rtpMapLines": "", "fmtpLines": "", "nackLines": "",
                 "nackpliLines": "", "ccmfirLines": "", "ericScreamLines": ""};

trunk/Source/WebCore/platform/mediastream/PeerMediaDescription.h

@@ -62 +62 @@
     void setMode(const String& mode) { m_mode = mode; }
 
+    const String& mid() const { return m_mid; }
+    void setMid(const String& mid) { m_mid = mid; }
+
     const Vector<RefPtr<MediaPayload>>& payloads() const { return m_payloads; }
     void addPayload(RefPtr<MediaPayload>&& payload) { m_payloads.append(WTFMove(payload)); }
@@ -118 +121 @@
         copy->m_address = String(m_address);
         copy->m_mode = String(m_mode);
+        copy->m_mid = String(m_mid);
 
         for (auto& payload : m_payloads)
@@ -154 +158 @@
     String m_address { "0.0.0.0" };
     String m_mode { "sendrecv" };
+    String m_mid;
 
     Vector<RefPtr<MediaPayload>> m_payloads;