Changeset 276717 in webkit

Timestamp:

Apr 28, 2021 9:29:11 AM (15 months ago)

Author:

youenn@apple.com

Message:

Set audio transceiver nMax to 1
​https://bugs.webkit.org/show_bug.cgi?id=225149
<rdar://75956639>

Reviewed by Alex Christensen.

Source/WebCore:

Implement step 8.4 of ​https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-addtransceiver and set nMax for audio to 1.

Test: webrtc/audio-addTransceiver.html

• Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:

(WebCore::LibWebRTCMediaEndpoint::createTransceiverBackends):
(WebCore::LibWebRTCMediaEndpoint::addTransceiver):

• Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
• Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:

(WebCore::fromRtpTransceiverInit):

• Modules/mediastream/libwebrtc/LibWebRTCUtils.h:

LayoutTests:

• webrtc/audio-addTransceiver-expected.txt: Added.
• webrtc/audio-addTransceiver.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/audio-addTransceiver-expected.txt (added)
• LayoutTests/webrtc/audio-addTransceiver.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (modified) (3 diffs)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-04-28  Youenn Fablet  <youenn@apple.com>
+
+        Set audio transceiver nMax to 1
+        https://bugs.webkit.org/show_bug.cgi?id=225149
+        <rdar://75956639>
+
+        Reviewed by Alex Christensen.
+
+        * webrtc/audio-addTransceiver-expected.txt: Added.
+        * webrtc/audio-addTransceiver.html: Added.
+
 2021-04-28  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-28  Youenn Fablet  <youenn@apple.com>
+
+        Set audio transceiver nMax to 1
+        https://bugs.webkit.org/show_bug.cgi?id=225149
+        <rdar://75956639>
+
+        Reviewed by Alex Christensen.
+
+        Implement step 8.4 of https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-addtransceiver and set nMax for audio to 1.
+
+        Test: webrtc/audio-addTransceiver.html
+
+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+        (WebCore::LibWebRTCMediaEndpoint::createTransceiverBackends):
+        (WebCore::LibWebRTCMediaEndpoint::addTransceiver):
+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
+        * Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
+        (WebCore::fromRtpTransceiverInit):
+        * Modules/mediastream/libwebrtc/LibWebRTCUtils.h:
+
 2021-04-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp

@@ -431 +431 @@
 
 template<typename T>
-ExceptionOr<LibWebRTCMediaEndpoint::Backends> LibWebRTCMediaEndpoint::createTransceiverBackends(T&& trackOrKind, const RTCRtpTransceiverInit& init, LibWebRTCRtpSenderBackend::Source&& source)
-{
-    auto result = m_backend->AddTransceiver(WTFMove(trackOrKind), fromRtpTransceiverInit(init));
+ExceptionOr<LibWebRTCMediaEndpoint::Backends> LibWebRTCMediaEndpoint::createTransceiverBackends(T&& trackOrKind, webrtc::RtpTransceiverInit&& init, LibWebRTCRtpSenderBackend::Source&& source)
+{
+    auto result = m_backend->AddTransceiver(WTFMove(trackOrKind), WTFMove(init));
     if (!result.ok())
         return toException(result.error());
@@ -444 +444 @@
 {
     auto type = trackKind == "audio" ? cricket::MediaType::MEDIA_TYPE_AUDIO : cricket::MediaType::MEDIA_TYPE_VIDEO;
-    return createTransceiverBackends(type, init, nullptr);
+    return createTransceiverBackends(type, fromRtpTransceiverInit(init, type), nullptr);
 }
 
@@ -473 +473 @@
 ExceptionOr<LibWebRTCMediaEndpoint::Backends> LibWebRTCMediaEndpoint::addTransceiver(MediaStreamTrack& track, const RTCRtpTransceiverInit& init)
 {
+    auto type = track.source().type() == RealtimeMediaSource::Type::Audio ? cricket::MediaType::MEDIA_TYPE_AUDIO : cricket::MediaType::MEDIA_TYPE_VIDEO;
     auto sourceAndTrack = createSourceAndRTCTrack(track);
-    return createTransceiverBackends(WTFMove(sourceAndTrack.second), init, WTFMove(sourceAndTrack.first));
+    return createTransceiverBackends(WTFMove(sourceAndTrack.second), fromRtpTransceiverInit(init, type), WTFMove(sourceAndTrack.first));
 }
 

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h

@@ -148 +148 @@
 
     template<typename T>
-    ExceptionOr<Backends> createTransceiverBackends(T&&, const RTCRtpTransceiverInit&, LibWebRTCRtpSenderBackend::Source&&);
+    ExceptionOr<Backends> createTransceiverBackends(T&&, webrtc::RtpTransceiverInit&&, LibWebRTCRtpSenderBackend::Source&&);
 
     void OnStatsDelivered(const rtc::scoped_refptr<const webrtc::RTCStatsReport>&) final;

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp

@@ -318 +318 @@
 }
 
-webrtc::RtpTransceiverInit fromRtpTransceiverInit(const RTCRtpTransceiverInit& init)
+webrtc::RtpTransceiverInit fromRtpTransceiverInit(const RTCRtpTransceiverInit& init, cricket::MediaType type)
 {
     webrtc::RtpTransceiverInit rtcInit;
@@ -324 +324 @@
     for (auto& stream : init.streams)
         rtcInit.stream_ids.push_back(stream->id().utf8().data());
-    for (auto& encoding : init.sendEncodings)
-        rtcInit.send_encodings.push_back(fromRTCEncodingParameters(encoding));
+
+    if (type == cricket::MediaType::MEDIA_TYPE_AUDIO) {
+        if (!init.sendEncodings.isEmpty())
+            rtcInit.send_encodings.push_back(fromRTCEncodingParameters(init.sendEncodings[0]));
+    } else {
+        for (auto& encoding : init.sendEncodings)
+            rtcInit.send_encodings.push_back(fromRTCEncodingParameters(encoding));
+    }
     return rtcInit;
 }

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h

@@ -28 +28 @@
 
 #include "ExceptionCode.h"
+#include <webrtc/api/media_types.h>
 #include <wtf/text/WTFString.h>
 
@@ -59 +60 @@
 RTCRtpTransceiverDirection toRTCRtpTransceiverDirection(webrtc::RtpTransceiverDirection);
 webrtc::RtpTransceiverDirection fromRTCRtpTransceiverDirection(RTCRtpTransceiverDirection);
-webrtc::RtpTransceiverInit fromRtpTransceiverInit(const RTCRtpTransceiverInit&);
+webrtc::RtpTransceiverInit fromRtpTransceiverInit(const RTCRtpTransceiverInit&, cricket::MediaType);
 
 ExceptionCode toExceptionCode(webrtc::RTCErrorType);