Attachment 349590 Details for Bug 189563 – Patch

[patch] Patch

bug-189563-20180912153259.patch (text/plain), 24.16 KB, created by youenn fablet on 2018-09-12 15:33:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-09-12 15:33:00 PDT

Size: 24.16 KB

patch

obsolete

>Subversion Revision: 235928
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6d4f0b82615cb283a013b6f45ed84f8c03f69a78..6e3db3ca975847ccff9982e9c78a881857fea80f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,41 @@
>+2018-09-12  Youenn Fablet  <youenn@apple.com>
>+
>+        Introduce RTCRtpSendParameters
>+        https://bugs.webkit.org/show_bug.cgi?id=189563
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Introduce RTCRtpSendParameters to match the WebRTC specification.
>+        Split RTCRtpPrameters fields accordingly and update call sites.
>+
>+        Covered by updated test.
>+
>+        * CMakeLists.txt:
>+        * DerivedSources.make:
>+        * Modules/mediastream/PeerConnectionBackend.h:
>+        * Modules/mediastream/RTCRtpEncodingParameters.h:
>+        * Modules/mediastream/RTCRtpEncodingParameters.idl:
>+        * Modules/mediastream/RTCRtpParameters.h:
>+        * Modules/mediastream/RTCRtpParameters.idl:
>+        * Modules/mediastream/RTCRtpReceiver.cpp:
>+        * Modules/mediastream/RTCRtpSender.cpp:
>+        (WebCore::RTCRtpSender::getParameters):
>+        (WebCore::RTCRtpSender::setParameters):
>+        * Modules/mediastream/RTCRtpSender.h:
>+        * Modules/mediastream/RTCRtpSender.idl:
>+        * Modules/mediastream/RTCRtpSenderBackend.h:
>+        * Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp:
>+        (WebCore::LibWebRTCRtpSenderBackend::getParameters const):
>+        (WebCore::LibWebRTCRtpSenderBackend::setParameters):
>+        * Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h:
>+        * Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
>+        (WebCore::toRTCRtpParameters):
>+        (WebCore::toRTCRtpSendParameters):
>+        (WebCore::fromRTCRtpSendParameters):
>+        * Modules/mediastream/libwebrtc/LibWebRTCUtils.h:
>+        * Sources.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+
> 2018-09-11  Youenn Fablet  <youenn@apple.com>
> 
>         Split RTCRtpParameters idl and header file
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index 741be35f9df0e344838e9de971ce85848f0226d7..b6ae949aa86dcd72dc887a2973a75b3e90ef89ec 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -327,6 +327,7 @@ set(WebCore_NON_SVG_IDL_FILES
>     Modules/mediastream/RTCRtpParameters.idl
>     Modules/mediastream/RTCRtpReceiver.idl
>     Modules/mediastream/RTCRtpRtxParameters.idl
>+    Modules/mediastream/RTCRtpSendParameters.idl
>     Modules/mediastream/RTCRtpSender.idl
>     Modules/mediastream/RTCRtpTransceiver.idl
>     Modules/mediastream/RTCRtpTransceiverDirection.idl
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index 47355fe1e4bfbaf1cb7834d7357a05c7969fee4b..92cc15b534486fe2c0ad14c8a72915d344c40430 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -251,6 +251,7 @@ JS_BINDING_IDLS = \
>     $(WebCore)/Modules/mediastream/RTCRtpParameters.idl \
>     $(WebCore)/Modules/mediastream/RTCRtpReceiver.idl \
>     $(WebCore)/Modules/mediastream/RTCRtpRtxParameters.idl \
>+    $(WebCore)/Modules/mediastream/RTCRtpSendParameters.idl \
>     $(WebCore)/Modules/mediastream/RTCRtpSender.idl \
>     $(WebCore)/Modules/mediastream/RTCRtpTransceiver.idl \
>     $(WebCore)/Modules/mediastream/RTCRtpTransceiverDirection.idl \
>diff --git a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
>index 284a64a15a0c0fcef895237a73e8a9eb1cb0fba6..06e92722fdc4c5140d902f4d2ca484a5a3213747 100644
>--- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
>+++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
>@@ -35,7 +35,7 @@
> 
> #include "JSDOMPromiseDeferred.h"
> #include "LibWebRTCProvider.h"
>-#include "RTCRtpParameters.h"
>+#include "RTCRtpSendParameters.h"
> #include "RTCSessionDescription.h"
> #include "RTCSignalingState.h"
> #include <wtf/LoggerHelper.h>
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.h b/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.h
>index 5f2a7c4bb79dc23b090b26950f39768acc318332..7cdf16cfba11ee3d0a9589902ad73d7527be2433 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.h
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.h
>@@ -29,12 +29,13 @@
> 
> #include "RTCDtxStatus.h"
> #include "RTCPriorityType.h"
>+#include "RTCRtpCodingParameters.h"
> #include "RTCRtpFecParameters.h"
> #include "RTCRtpRtxParameters.h"
> 
> namespace WebCore {
> 
>-struct RTCRtpEncodingParameters {
>+struct RTCRtpEncodingParameters : RTCRtpCodingParameters {
>     unsigned long ssrc { 0 };
>     RTCRtpRtxParameters rtx;
>     RTCRtpFecParameters fec;
>@@ -43,7 +44,6 @@ struct RTCRtpEncodingParameters {
>     RTCPriorityType priority { RTCPriorityType::Medium };
>     unsigned long maxBitrate { 0 };
>     unsigned long maxFramerate { 0 };
>-    String rid;
>     double scaleResolutionDownBy { 1 };
> };
> 
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.idl b/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.idl
>index a78e304807f1e8abb8c01e18ee17fd78d8dd30c8..c804aca95c37aad4b319b3c4bd558e297e20ee4f 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.idl
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.idl
>@@ -27,7 +27,7 @@
>     Conditional=WEB_RTC,
>     EnabledAtRuntime=PeerConnection,
>     JSGenerateToJSObject,
>-] dictionary RTCRtpEncodingParameters {
>+] dictionary RTCRtpEncodingParameters : RTCRtpCodingParameters {
>     unsigned long ssrc;
>     RTCRtpRtxParameters rtx;
>     RTCRtpFecParameters fec;
>@@ -36,6 +36,5 @@
>     RTCPriorityType priority;
>     unsigned long maxBitrate;
>     unsigned long maxFramerate;
>-    DOMString rid;
>     double scaleResolutionDownBy = 1;
> };
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpParameters.h b/Source/WebCore/Modules/mediastream/RTCRtpParameters.h
>index 1975c478e26cc7344554237788081e0093451d27..a9782036434f1a42a301d4158006a832e3e82f61 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpParameters.h
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpParameters.h
>@@ -27,21 +27,15 @@
> 
> #if ENABLE(WEB_RTC)
> 
>-#include "RTCDegradationPreference.h"
> #include "RTCRtpCodecParameters.h"
>-#include "RTCRtpEncodingParameters.h"
> #include "RTCRtpHeaderExtensionParameters.h"
> #include <wtf/Vector.h>
>-#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
> struct RTCRtpParameters {
>-    String transactionId;
>-    Vector<RTCRtpEncodingParameters> encodings;
>     Vector<RTCRtpHeaderExtensionParameters> headerExtensions;
>     Vector<RTCRtpCodecParameters> codecs;
>-    RTCDegradationPreference degradationPreference { RTCDegradationPreference::Balanced };
> };
> 
> 
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpParameters.idl b/Source/WebCore/Modules/mediastream/RTCRtpParameters.idl
>index 468b11a81ef114b113066e5de8d525e07207b10e..b7e8b7ac186771ee1190827df4804ad2742fb019 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpParameters.idl
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpParameters.idl
>@@ -28,10 +28,7 @@
>     EnabledAtRuntime=PeerConnection,
>     JSGenerateToJSObject,
> ] dictionary RTCRtpParameters {
>-    DOMString transactionId;
>-    sequence<RTCRtpEncodingParameters> encodings;
>     sequence<RTCRtpHeaderExtensionParameters> headerExtensions;
>     // FIXME: Add RTCRtcpParameters rtcp;
>     sequence<RTCRtpCodecParameters> codecs;
>-    RTCDegradationPreference degradationPreference = "balanced";
> };
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
>index bfb61636fea4eb22ae5d4b9baecbb9b87cfa7d8f..58f42cad76cda64b7f55537062e1b80482fa7b28 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
>@@ -33,8 +33,6 @@
> 
> #if ENABLE(WEB_RTC)
> 
>-#include "RTCRtpParameters.h"
>-
> namespace WebCore {
> 
> RTCRtpReceiver::RTCRtpReceiver(Ref<MediaStreamTrack>&& track, std::unique_ptr<RTCRtpReceiverBackend>&& backend)
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp b/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp
>index 190817611000957d549bf6f54ee1c1eac5878be1..7ebddd9708133e43ea312192d18402e0c0a076ec 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp
>@@ -94,14 +94,14 @@ void RTCRtpSender::replaceTrack(ScriptExecutionContext& context, RefPtr<MediaStr
>     m_backend->replaceTrack(context, *this, WTFMove(withTrack), WTFMove(promise));
> }
> 
>-RTCRtpParameters RTCRtpSender::getParameters()
>+RTCRtpSendParameters RTCRtpSender::getParameters()
> {
>     if (isStopped())
>         return { };
>     return m_backend->getParameters();
> }
> 
>-void RTCRtpSender::setParameters(const RTCRtpParameters& parameters, DOMPromiseDeferred<void>&& promise)
>+void RTCRtpSender::setParameters(const RTCRtpSendParameters& parameters, DOMPromiseDeferred<void>&& promise)
> {
>     if (isStopped()) {
>         promise.reject(InvalidStateError);
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSender.h b/Source/WebCore/Modules/mediastream/RTCRtpSender.h
>index bab39dc1523c90ae4abf6ff98b9b25885f469d3e..20bbfde18c287543ff51f43c5dd79ae23ee1d300 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpSender.h
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpSender.h
>@@ -59,8 +59,8 @@ public:
> 
>     void replaceTrack(ScriptExecutionContext&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&);
> 
>-    RTCRtpParameters getParameters();
>-    void setParameters(const RTCRtpParameters&, DOMPromiseDeferred<void>&&);
>+    RTCRtpSendParameters getParameters();
>+    void setParameters(const RTCRtpSendParameters&, DOMPromiseDeferred<void>&&);
> 
>     RTCRtpSenderBackend* backend() { return m_backend.get(); }
> 
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSender.idl b/Source/WebCore/Modules/mediastream/RTCRtpSender.idl
>index 2398a78968e6f5cb10f1d75acd578b7dfcd7613a..91f65b323967d7a5ea83c1d67aaaa3ab79b2fee0 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpSender.idl
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpSender.idl
>@@ -39,7 +39,7 @@
>     // FIXME 169662: missing rtcpTransport
>     // FIXME 169662: missing getCapabilities
>     // FIXME 169662: missing setStreams
>-    RTCRtpParameters getParameters();
>-    Promise<void> setParameters(RTCRtpParameters parameters);
>+    RTCRtpSendParameters getParameters();
>+    Promise<void> setParameters(RTCRtpSendParameters parameters);
>     [CallWith=ScriptExecutionContext] Promise<void> replaceTrack(MediaStreamTrack? withTrack);
> };
>diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h b/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h
>index 6812936df5f5e4b607cea4a7a3d2a18ce86a6221..7ece5b12d0f4f6f4733c48347342cb63a0648acc 100644
>--- a/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h
>+++ b/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h
>@@ -27,19 +27,19 @@
> #if ENABLE(WEB_RTC)
> 
> #include "JSDOMPromiseDeferred.h"
>-#include "RTCRtpParameters.h"
> 
> namespace WebCore {
> 
> class MediaStreamTrack;
> class RTCRtpSender;
>+struct RTCRtpSendParameters;
> class ScriptExecutionContext;
> 
> class RTCRtpSenderBackend {
> public:
>     virtual void replaceTrack(ScriptExecutionContext&, RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&) = 0;
>-    virtual RTCRtpParameters getParameters() const = 0;
>-    virtual void setParameters(const RTCRtpParameters&, DOMPromiseDeferred<void>&&) = 0;
>+    virtual RTCRtpSendParameters getParameters() const = 0;
>+    virtual void setParameters(const RTCRtpSendParameters&, DOMPromiseDeferred<void>&&) = 0;
>     virtual ~RTCRtpSenderBackend() = default;
> };
> 
>diff --git a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp
>index a0e1488b1eecf887d5cc998d737ad6ec97787555..8990489d49cdda9649ec288a658c4e4b993dc485 100644
>--- a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp
>+++ b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp
>@@ -100,21 +100,21 @@ void LibWebRTCRtpSenderBackend::replaceTrack(ScriptExecutionContext& context, RT
>     });
> }
> 
>-RTCRtpParameters LibWebRTCRtpSenderBackend::getParameters() const
>+RTCRtpSendParameters LibWebRTCRtpSenderBackend::getParameters() const
> {
>     if (!m_rtcSender)
>         return { };
> 
>-    return toRTCRtpParameters(m_rtcSender->GetParameters());
>+    return toRTCRtpSendParameters(m_rtcSender->GetParameters());
> }
> 
>-void LibWebRTCRtpSenderBackend::setParameters(const RTCRtpParameters& parameters, DOMPromiseDeferred<void>&& promise)
>+void LibWebRTCRtpSenderBackend::setParameters(const RTCRtpSendParameters& parameters, DOMPromiseDeferred<void>&& promise)
> {
>     if (!m_rtcSender) {
>         promise.reject(NotSupportedError);
>         return;
>     }
>-    auto error = m_rtcSender->SetParameters(fromRTCRtpParameters(parameters));
>+    auto error = m_rtcSender->SetParameters(fromRTCRtpSendParameters(parameters));
>     if (!error.ok()) {
>         promise.reject(Exception { InvalidStateError, error.message() });
>         return;
>diff --git a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h
>index c7344043a365b242b821015bea74b1c32b81f0a4..89d416d2856662f107e2bbc3a55969558d9755cd 100644
>--- a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h
>+++ b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h
>@@ -97,8 +97,8 @@ public:
> 
> private:
>     void replaceTrack(ScriptExecutionContext&, RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&) final;
>-    RTCRtpParameters getParameters() const final;
>-    void setParameters(const RTCRtpParameters&, DOMPromiseDeferred<void>&&) final;
>+    RTCRtpSendParameters getParameters() const final;
>+    void setParameters(const RTCRtpSendParameters&, DOMPromiseDeferred<void>&&) final;
> 
>     WeakPtr<LibWebRTCPeerConnectionBackend> m_peerConnectionBackend;
>     rtc::scoped_refptr<webrtc::RtpSenderInterface> m_rtcSender;
>diff --git a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp
>index d36ef66841a6a7476f2066a7a8e5e7bfd6523c61..9ad4509b3bdd22a27fb8a3f21b4cdc394eb5cb98 100644
>--- a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp
>+++ b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp
>@@ -29,7 +29,7 @@
> 
> #include "LibWebRTCMacros.h"
> #include "RTCPeerConnection.h"
>-#include "RTCRtpParameters.h"
>+#include "RTCRtpSendParameters.h"
> #include <wtf/text/WTFString.h>
> 
> #pragma GCC diagnostic push
>@@ -136,14 +136,22 @@ RTCRtpParameters toRTCRtpParameters(const webrtc::RtpParameters& rtcParameters)
> {
>     RTCRtpParameters parameters;
> 
>-    parameters.transactionId = fromStdString(rtcParameters.transaction_id);
>-    for (auto& rtcEncoding : rtcParameters.encodings)
>-        parameters.encodings.append(toRTCEncodingParameters(rtcEncoding));
>     for (auto& extension : rtcParameters.header_extensions)
>         parameters.headerExtensions.append(toRTCHeaderExtensionParameters(extension));
>     for (auto& codec : rtcParameters.codecs)
>         parameters.codecs.append(toRTCCodecParameters(codec));
> 
>+    return parameters;
>+}
>+
>+RTCRtpSendParameters toRTCRtpSendParameters(const webrtc::RtpParameters& rtcParameters)
>+{
>+    RTCRtpSendParameters parameters { toRTCRtpParameters(rtcParameters) };
>+
>+    parameters.transactionId = fromStdString(rtcParameters.transaction_id);
>+    for (auto& rtcEncoding : rtcParameters.encodings)
>+        parameters.encodings.append(toRTCEncodingParameters(rtcEncoding));
>+
>     switch (rtcParameters.degradation_preference) {
>     // FIXME: Support DegradationPreference::DISABLED.
>     case webrtc::DegradationPreference::DISABLED:
>@@ -160,7 +168,7 @@ RTCRtpParameters toRTCRtpParameters(const webrtc::RtpParameters& rtcParameters)
>     return parameters;
> }
> 
>-webrtc::RtpParameters fromRTCRtpParameters(const RTCRtpParameters& parameters)
>+webrtc::RtpParameters fromRTCRtpSendParameters(const RTCRtpSendParameters& parameters)
> {
>     webrtc::RtpParameters rtcParameters;
>     rtcParameters.transaction_id = parameters.transactionId.utf8().data();
>diff --git a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h
>index c1b307c2228149aa4f51e7a593fd467c464633f2..8436747de30cc1ae674bc4a19b464a64417dfaa1 100644
>--- a/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h
>+++ b/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.h
>@@ -38,12 +38,15 @@ enum class RtpTransceiverDirection;
> namespace WebCore {
> 
> struct RTCRtpParameters;
>+struct RTCRtpSendParameters;
> struct RTCRtpTransceiverInit;
> 
> enum class RTCRtpTransceiverDirection;
> 
> RTCRtpParameters toRTCRtpParameters(const webrtc::RtpParameters&);
> webrtc::RtpParameters fromRTCRtpParameters(const RTCRtpParameters&);
>+RTCRtpSendParameters toRTCRtpSendParameters(const webrtc::RtpParameters&);
>+webrtc::RtpParameters fromRTCRtpSendParameters(const RTCRtpSendParameters&);
> 
> RTCRtpTransceiverDirection toRTCRtpTransceiverDirection(webrtc::RtpTransceiverDirection);
> webrtc::RtpTransceiverDirection fromRTCRtpTransceiverDirection(RTCRtpTransceiverDirection);
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index c3a44bf209bdb811c9ee4781a9b930ded863875f..789006d9ce0dd0ecde606ba3ad3af101aa92dca6 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -2884,6 +2884,7 @@ JSRTCRtpHeaderExtensionParameters.cpp
> JSRTCRtpParameters.cpp
> JSRTCRtpRtxParameters.cpp
> JSRTCRtpReceiver.cpp
>+JSRTCRtpSendParameters.cpp
> JSRTCRtpSender.cpp
> JSRTCRtpTransceiver.cpp
> JSRTCRtpTransceiverDirection.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index f011aae66a736188f0b9377e4127af0147ee126c..58eae96618cd9c420003a13ca51be8894fa861d5 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -7232,6 +7232,12 @@
> 		4147E2B41C89912600A7E715 /* FetchLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FetchLoader.cpp; sourceTree = "<group>"; };
> 		4147E2B51C89912600A7E715 /* FetchLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchLoader.h; sourceTree = "<group>"; };
> 		4147E2B61C89912600A7E715 /* FetchLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchLoaderClient.h; sourceTree = "<group>"; };
>+		414AD3FC2149842000521676 /* RTCRtpSendParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCRtpSendParameters.h; sourceTree = "<group>"; };
>+		414AD3FE2149842000521676 /* RTCRtpSendParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpSendParameters.idl; sourceTree = "<group>"; };
>+		414AD3FF21498D3000521676 /* RTCRtpCodingParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCRtpCodingParameters.h; sourceTree = "<group>"; };
>+		414AD40021498D3100521676 /* RTCRtpDecodingParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCRtpDecodingParameters.h; sourceTree = "<group>"; };
>+		414AD40121498D3100521676 /* RTCRtpDecodingParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpDecodingParameters.idl; sourceTree = "<group>"; };
>+		414AD40221498D3200521676 /* RTCRtpCodingParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpCodingParameters.idl; sourceTree = "<group>"; };
> 		414B82021D6DF0D90077EBE3 /* StructuredClone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StructuredClone.cpp; sourceTree = "<group>"; };
> 		414B82031D6DF0D90077EBE3 /* StructuredClone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructuredClone.h; sourceTree = "<group>"; };
> 		414DEDE51F9FE9150047C40D /* EmptyFrameLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmptyFrameLoaderClient.h; sourceTree = "<group>"; };
>@@ -15184,6 +15190,10 @@
> 				41E593FD214865A900D3CB61 /* RTCPriorityType.idl */,
> 				41FCB75F214866FF0038ADC6 /* RTCRtpCodecParameters.h */,
> 				41FCB759214865D30038ADC6 /* RTCRtpCodecParameters.idl */,
>+				414AD3FF21498D3000521676 /* RTCRtpCodingParameters.h */,
>+				414AD40221498D3200521676 /* RTCRtpCodingParameters.idl */,
>+				414AD40021498D3100521676 /* RTCRtpDecodingParameters.h */,
>+				414AD40121498D3100521676 /* RTCRtpDecodingParameters.idl */,
> 				41FCB761214867000038ADC6 /* RTCRtpEncodingParameters.h */,
> 				41E593FF214865AA00D3CB61 /* RTCRtpEncodingParameters.idl */,
> 				41FCB75B214866FD0038ADC6 /* RTCRtpFecParameters.h */,
>@@ -15202,6 +15212,8 @@
> 				5E2C435A1BCEE30D0001E2BC /* RTCRtpSender.h */,
> 				5E2C435B1BCEE30D0001E2BC /* RTCRtpSender.idl */,
> 				41D1A046213EDDEB0063FB6B /* RTCRtpSenderBackend.h */,
>+				414AD3FC2149842000521676 /* RTCRtpSendParameters.h */,
>+				414AD3FE2149842000521676 /* RTCRtpSendParameters.idl */,
> 				5E5E2B101CFC3E4B000C0D85 /* RTCRtpTransceiver.cpp */,
> 				5E5E2B111CFC3E4B000C0D85 /* RTCRtpTransceiver.h */,
> 				5E5E2B121CFC3E4B000C0D85 /* RTCRtpTransceiver.idl */,
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d1ff4f6f6c7a1571545b957404b3494e9768836f..cdeb028991781a72a72bc6d06fa3724f7439f962 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-12  Youenn Fablet  <youenn@apple.com>
>+
>+        Introduce RTCRtpSendParameters
>+        https://bugs.webkit.org/show_bug.cgi?id=189563
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * webrtc/video-getParameters-expected.txt:
>+        * webrtc/video-getParameters.html:
>+
> 2018-09-11  Olivia Barnett  <obarnett@apple.com>
> 
>         Implement the Web Share API for mac
>diff --git a/LayoutTests/webrtc/video-getParameters-expected.txt b/LayoutTests/webrtc/video-getParameters-expected.txt
>index 242a4a5371ae79769e82f54040e04e106293e765..927d52e8c10aa2acab21b1e2fd365e378d4db067 100644
>--- a/LayoutTests/webrtc/video-getParameters-expected.txt
>+++ b/LayoutTests/webrtc/video-getParameters-expected.txt
>@@ -1,3 +1,3 @@
> 
>-PASS Basic video stats 
>+PASS Sender and receiver parameters 
> 
>diff --git a/LayoutTests/webrtc/video-getParameters.html b/LayoutTests/webrtc/video-getParameters.html
>index 9e43930cecd5e2eb7e2911d0ef3436163fdb848b..a5043a4ee930d2e5f27d5b45b877b177aa701ddb 100644
>--- a/LayoutTests/webrtc/video-getParameters.html
>+++ b/LayoutTests/webrtc/video-getParameters.html
>@@ -40,17 +40,19 @@ promise_test((test) => {
>         assert_true(!!senderParameters, "sender parameters should not be undefined or null");
>         assert_true(!!receiverParameters, "receiver parameters should not be undefined or null");
> 
>+        assert_array_equals(receiverParameters.codecs, [], "receiver codecs");
>+        assert_array_equals(receiverParameters.headerExtensions, [], "receiver header extensions");
>+
>+        senderParameters.encodings[0].ssrc = 1;
>         senderParameters.encodings[0].fec.ssrc = 1;
>         senderParameters.encodings[0].rtx.ssrc = 1;
> 
>-        senderParameters.transactionId = "";
>-        receiverParameters.transactionId = "";
>-
>-        senderParameters.encodings[0].ssrc = 1;
>-        assert_equals(JSON.stringify(senderParameters), '{"codecs":[],"degradationPreference":"balanced","encodings":[{"active":true,"fec":{"ssrc":1},"maxBitrate":0,"maxFramerate":0,"priority":"medium","rid":"","rtx":{"ssrc":1},"scaleResolutionDownBy":1,"ssrc":1}],"headerExtensions":[],"transactionId":""}', "Testing sanitized sender parameters");
>-        assert_equals(JSON.stringify(receiverParameters), '{"codecs":[],"degradationPreference":"balanced","encodings":[],"headerExtensions":[],"transactionId":""}', "Testing sanitized receiver parameters");
>+        assert_true(!!senderParameters.transactionId, "sender transaction");
>+        assert_array_equals(senderParameters.codecs, [], "sender codecs");
>+        assert_array_equals(senderParameters.headerExtensions, [], "sender header extensions");
>+        assert_equals(senderParameters.degradationPreference, "balanced", "sender degradation");
>     });
>-}, "Basic video stats");
>+}, "Sender and receiver parameters");
>         </script>
>     </body>
> </html>

Actions: View | Formatted Diff | Diff

Attachments on bug 189563: 349590 | 349593 | 349663