Changeset 201920 in webkit

Timestamp:

Jun 10, 2016 2:15:07 AM (8 years ago)

Author:

adam.bergkvist@ericsson.com

Message:

WebRTC: Imlement MediaEndpointPeerConnection::createAnswer()
​https://bugs.webkit.org/show_bug.cgi?id=158566

Reviewed by Eric Carlson.

Source/WebCore:

Add the MediaEndpointPeerConnection implementation of RTCPeerConnection.createAnswer [1].
createAnswer() creates a 'reply' to an remote offer set with setRemoteDescription(),
completes the offer/answer dialog and brings the RTCPeerConnection back to the 'stable'
signaling state.

[1] ​https://w3c.github.io/webrtc-pc/archives/20160513/webrtc.html#dom-rtcpeerconnection-createanswer

Test: fast/mediastream/RTCPeerConnection-inspect-answer.html

• Modules/mediastream/MediaEndpointPeerConnection.cpp:

(WebCore::MediaEndpointPeerConnection::createOfferTask):
Align creation of RTCSessionDescription with createAnswerTask.
(WebCore::MediaEndpointPeerConnection::createAnswer):
(WebCore::MediaEndpointPeerConnection::createAnswerTask):
Add Implementation.

• Modules/mediastream/MediaEndpointPeerConnection.h:

LayoutTests:

Add test for RTCPeerConnection.createAnswer.

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

Generate two answers, one with audio only and a second with audio and video, and inspect
the result.

• platform/mac/TestExpectations:

Skip tests for mac that require building with WEB_RTC enabled.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-inspect-answer-expected.txt (added)
• LayoutTests/fast/mediastream/RTCPeerConnection-inspect-answer.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-10  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Imlement MediaEndpointPeerConnection::createAnswer()
+        https://bugs.webkit.org/show_bug.cgi?id=158566
+
+        Reviewed by Eric Carlson.
+
+        Add test for RTCPeerConnection.createAnswer.
+
+        * fast/mediastream/RTCPeerConnection-inspect-answer-expected.txt: Added.
+        * fast/mediastream/RTCPeerConnection-inspect-answer.html: Added.
+        Generate two answers, one with audio only and a second with audio and video, and inspect
+        the result.
+        * platform/mac/TestExpectations:
+        Skip tests for mac that require building with WEB_RTC enabled.
+
 2016-06-08  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -194 +194 @@
 fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html
 fast/mediastream/RTCTrackEvent-constructor.html
+fast/mediastream/RTCPeerConnection-inspect-answer.html
 
 # Asserts in debug.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-10  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        WebRTC: Imlement MediaEndpointPeerConnection::createAnswer()
+        https://bugs.webkit.org/show_bug.cgi?id=158566
+
+        Reviewed by Eric Carlson.
+
+        Add the MediaEndpointPeerConnection implementation of RTCPeerConnection.createAnswer [1].
+        createAnswer() creates a 'reply' to an remote offer set with setRemoteDescription(),
+        completes the offer/answer dialog and brings the RTCPeerConnection back to the 'stable'
+        signaling state.
+
+        [1] https://w3c.github.io/webrtc-pc/archives/20160513/webrtc.html#dom-rtcpeerconnection-createanswer
+
+        Test: fast/mediastream/RTCPeerConnection-inspect-answer.html
+
+        * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+        (WebCore::MediaEndpointPeerConnection::createOfferTask):
+        Align creation of RTCSessionDescription with createAnswerTask.
+        (WebCore::MediaEndpointPeerConnection::createAnswer):
+        (WebCore::MediaEndpointPeerConnection::createAnswerTask):
+        Add Implementation.
+        * Modules/mediastream/MediaEndpointPeerConnection.h:
+
 2016-06-08  Sergio Villar Senin  <svillar@igalia.com>
 

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

@@ -192 +192 @@
     }
 
-    String sdpString;
-    SDPProcessor::Result result = m_sdpProcessor->generate(*configurationSnapshot, sdpString);
-    if (result != SDPProcessor::Result::Success) {
-        LOG_ERROR("SDPProcessor internal error");
-        return;
-    }
-
-    promise.resolve(RTCSessionDescription::create(RTCSessionDescription::SdpType::Offer, sdpString));
+    auto description = MediaEndpointSessionDescription::create(RTCSessionDescription::SdpType::Offer, WTFMove(configurationSnapshot));
+    promise.resolve(*description->toRTCSessionDescription(*m_sdpProcessor));
 }
 
 void MediaEndpointPeerConnection::createAnswer(RTCAnswerOptions& options, SessionDescriptionPromise&& promise)
 {
-    UNUSED_PARAM(options);
-
-    notImplemented();
-
-    promise.reject(NOT_SUPPORTED_ERR);
+    runTask([this, protectedOptions = RefPtr<RTCAnswerOptions>(&options), protectedPromise = WTFMove(promise)]() mutable {
+        createAnswerTask(*protectedOptions, protectedPromise);
+    });
+}
+
+void MediaEndpointPeerConnection::createAnswerTask(RTCAnswerOptions&, SessionDescriptionPromise& promise)
+{
+    ASSERT(!m_dtlsFingerprint.isEmpty());
+
+    if (m_client->internalSignalingState() == SignalingState::Closed)
+        return;
+
+    if (!internalRemoteDescription()) {
+        promise.reject(INVALID_STATE_ERR, "No remote description set");
+        return;
+    }
+
+    MediaEndpointSessionDescription* localDescription = internalLocalDescription();
+    RefPtr<MediaEndpointSessionConfiguration> configurationSnapshot = localDescription ?
+        localDescription->configuration()->clone() : MediaEndpointSessionConfiguration::create();
+
+    configurationSnapshot->setSessionVersion(m_sdpAnswerSessionVersion++);
+
+    auto transceivers = RtpTransceiverVector(m_client->getTransceivers());
+    const MediaDescriptionVector& remoteMediaDescriptions = internalRemoteDescription()->configuration()->mediaDescriptions();
+
+    for (unsigned i = 0; i < remoteMediaDescriptions.size(); ++i) {
+        PeerMediaDescription& remoteMediaDescription = *remoteMediaDescriptions[i];
+
+        RTCRtpTransceiver* transceiver = matchTransceiverByMid(transceivers, remoteMediaDescription.mid());
+        if (!transceiver) {
+            LOG_ERROR("Could not find a matching transceiver for remote description while creating answer");
+            continue;
+        }
+
+        if (i >= configurationSnapshot->mediaDescriptions().size()) {
+            auto newMediaDescription = PeerMediaDescription::create();
+
+            RTCRtpSender& sender = *transceiver->sender();
+            if (sender.track()) {
+                if (sender.mediaStreamIds().size())
+                    newMediaDescription->setMediaStreamId(sender.mediaStreamIds()[0]);
+                newMediaDescription->setMediaStreamTrackId(sender.trackId());
+                newMediaDescription->addSsrc(cryptographicallyRandomNumber());
+            }
+
+            newMediaDescription->setMode(transceiver->directionString());
+            newMediaDescription->setType(remoteMediaDescription.type());
+            newMediaDescription->setMid(remoteMediaDescription.mid());
+            newMediaDescription->setDtlsSetup(remoteMediaDescription.dtlsSetup() == "active" ? "passive" : "active");
+            newMediaDescription->setDtlsFingerprintHashFunction(m_dtlsFingerprintFunction);
+            newMediaDescription->setDtlsFingerprint(m_dtlsFingerprint);
+            newMediaDescription->setCname(m_cname);
+            newMediaDescription->setIceUfrag(m_iceUfrag);
+            newMediaDescription->setIcePassword(m_icePassword);
+
+            configurationSnapshot->addMediaDescription(WTFMove(newMediaDescription));
+        }
+
+        PeerMediaDescription& localMediaDescription = *configurationSnapshot->mediaDescriptions()[i];
+
+        localMediaDescription.setPayloads(remoteMediaDescription.payloads());
+        localMediaDescription.setRtcpMux(remoteMediaDescription.rtcpMux());
+
+        if (!localMediaDescription.ssrcs().size())
+            localMediaDescription.addSsrc(cryptographicallyRandomNumber());
+
+        if (localMediaDescription.dtlsSetup() == "actpass")
+            localMediaDescription.setDtlsSetup("passive");
+
+        transceivers.removeFirst(transceiver);
+    }
+
+    // Unassociated (non-stopped) transceivers need to be negotiated in a follow-up offer.
+    if (hasUnassociatedTransceivers(transceivers))
+        markAsNeedingNegotiation();
+
+    auto description = MediaEndpointSessionDescription::create(RTCSessionDescription::SdpType::Answer, WTFMove(configurationSnapshot));
+    promise.resolve(*description->toRTCSessionDescription(*m_sdpProcessor));
 }
 

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

@@ -88 +88 @@
 
     void createOfferTask(RTCOfferOptions&, PeerConnection::SessionDescriptionPromise&);
+    void createAnswerTask(RTCAnswerOptions&, PeerConnection::SessionDescriptionPromise&);
 
     void setLocalDescriptionTask(RefPtr<RTCSessionDescription>&&, PeerConnection::VoidPromise&);
@@ -121 +122 @@
     String m_dtlsFingerprintFunction;
     unsigned m_sdpOfferSessionVersion { 0 };
+    unsigned m_sdpAnswerSessionVersion { 0 };
 
     RefPtr<MediaEndpointSessionDescription> m_currentLocalDescription;