⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 235973 in webkit


Ignore:
Timestamp:
Sep 13, 2018, 8:31:04 AM (8 years ago)
Author:
youenn@apple.com
Message:

Introduce RTCRtpSendParameters
​https://bugs.webkit.org/show_bug.cgi?id=189563

Reviewed by Eric Carlson.

Source/WebCore:

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/RTCRtpCodingParameters.h: Added
  • Modules/mediastream/RTCRtpCodingParameters.idl: Added
  • Modules/mediastream/RTCRtpDecodingParameters.h: Added
  • Modules/mediastream/RTCRtpDecodingParameters.idl: Added
  • Modules/mediastream/RTCRtpEncodingParameters.h:
  • Modules/mediastream/RTCRtpEncodingParameters.idl:
  • Modules/mediastream/RTCRtpParameters.h:
  • Modules/mediastream/RTCRtpParameters.idl:
  • Modules/mediastream/RTCRtpReceiver.cpp:
  • Modules/mediastream/RTCRtpSendParameters.h: Added.

(WebCore::RTCRtpSendParameters::RTCRtpSendParameters):

  • Modules/mediastream/RTCRtpSendParameters.idl: Added.
  • 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:

LayoutTests:

  • webrtc/video-getParameters-expected.txt:
  • webrtc/video-getParameters.html:
Location:
trunk
Files:
22 edited
6 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r235964 r235973  
     12018-09-13  Youenn Fablet  <youenn@apple.com>
     2
     3        Introduce RTCRtpSendParameters
     4        https://bugs.webkit.org/show_bug.cgi?id=189563
     5
     6        Reviewed by Eric Carlson.
     7
     8        * webrtc/video-getParameters-expected.txt:
     9        * webrtc/video-getParameters.html:
     10
    1112018-09-12  Dean Jackson  <dino@grorg.org>
    212

  • trunk/LayoutTests/webrtc/video-getParameters-expected.txt

    r214420 r235973  
    11
    2 PASS Basic video stats
     2PASS Sender and receiver parameters
    33

  • trunk/LayoutTests/webrtc/video-getParameters.html

    r235809 r235973  
    4141        assert_true(!!receiverParameters, "receiver parameters should not be undefined or null");
    4242
     43        assert_array_equals(receiverParameters.codecs, [], "receiver codecs");
     44        assert_array_equals(receiverParameters.headerExtensions, [], "receiver header extensions");
     45
     46        senderParameters.encodings[0].ssrc = 1;
    4347        senderParameters.encodings[0].fec.ssrc = 1;
    4448        senderParameters.encodings[0].rtx.ssrc = 1;
    4549
    46         senderParameters.transactionId = "";
    47         receiverParameters.transactionId = "";
    48 
    49         senderParameters.encodings[0].ssrc = 1;
    50         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");
    51         assert_equals(JSON.stringify(receiverParameters), '{"codecs":[],"degradationPreference":"balanced","encodings":[],"headerExtensions":[],"transactionId":""}', "Testing sanitized receiver parameters");
     50        assert_true(!!senderParameters.transactionId, "sender transaction");
     51        assert_array_equals(senderParameters.codecs, [], "sender codecs");
     52        assert_array_equals(senderParameters.headerExtensions, [], "sender header extensions");
     53        assert_equals(senderParameters.degradationPreference, "balanced", "sender degradation");
    5254    });
    53 }, "Basic video stats");
     55}, "Sender and receiver parameters");
    5456        </script>
    5557    </body>

  • trunk/Source/WebCore/CMakeLists.txt

    r235945 r235973  
    328328    Modules/mediastream/RTCRtpReceiver.idl
    329329    Modules/mediastream/RTCRtpRtxParameters.idl
     330    Modules/mediastream/RTCRtpSendParameters.idl
    330331    Modules/mediastream/RTCRtpSender.idl
    331332    Modules/mediastream/RTCRtpTransceiver.idl

  • trunk/Source/WebCore/ChangeLog

    r235971 r235973  
     12018-09-13  Youenn Fablet  <youenn@apple.com>
     2
     3        Introduce RTCRtpSendParameters
     4        https://bugs.webkit.org/show_bug.cgi?id=189563
     5
     6        Reviewed by Eric Carlson.
     7
     8        Introduce RTCRtpSendParameters to match the WebRTC specification.
     9        Split RTCRtpPrameters fields accordingly and update call sites.
     10
     11        Covered by updated test.
     12
     13        * CMakeLists.txt:
     14        * DerivedSources.make:
     15        * Modules/mediastream/PeerConnectionBackend.h:
     16        * Modules/mediastream/RTCRtpCodingParameters.h: Added
     17        * Modules/mediastream/RTCRtpCodingParameters.idl: Added
     18        * Modules/mediastream/RTCRtpDecodingParameters.h: Added
     19        * Modules/mediastream/RTCRtpDecodingParameters.idl: Added
     20        * Modules/mediastream/RTCRtpEncodingParameters.h:
     21        * Modules/mediastream/RTCRtpEncodingParameters.idl:
     22        * Modules/mediastream/RTCRtpParameters.h:
     23        * Modules/mediastream/RTCRtpParameters.idl:
     24        * Modules/mediastream/RTCRtpReceiver.cpp:
     25        * Modules/mediastream/RTCRtpSendParameters.h: Added.
     26        (WebCore::RTCRtpSendParameters::RTCRtpSendParameters):
     27        * Modules/mediastream/RTCRtpSendParameters.idl: Added.
     28        * Modules/mediastream/RTCRtpSender.cpp:
     29        (WebCore::RTCRtpSender::getParameters):
     30        (WebCore::RTCRtpSender::setParameters):
     31        * Modules/mediastream/RTCRtpSender.h:
     32        * Modules/mediastream/RTCRtpSender.idl:
     33        * Modules/mediastream/RTCRtpSenderBackend.h:
     34        * Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp:
     35        (WebCore::LibWebRTCRtpSenderBackend::getParameters const):
     36        (WebCore::LibWebRTCRtpSenderBackend::setParameters):
     37        * Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h:
     38        * Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
     39        (WebCore::toRTCRtpParameters):
     40        (WebCore::toRTCRtpSendParameters):
     41        (WebCore::fromRTCRtpSendParameters):
     42        * Modules/mediastream/libwebrtc/LibWebRTCUtils.h:
     43        * Sources.txt:
     44        * WebCore.xcodeproj/project.pbxproj:
     45
    1462018-09-13  Xabier Rodriguez Calvar  <calvaris@igalia.com>
    247

  • trunk/Source/WebCore/DerivedSources.make

    r235945 r235973  
    252252    $(WebCore)/Modules/mediastream/RTCRtpReceiver.idl \
    253253    $(WebCore)/Modules/mediastream/RTCRtpRtxParameters.idl \
     254    $(WebCore)/Modules/mediastream/RTCRtpSendParameters.idl \
    254255    $(WebCore)/Modules/mediastream/RTCRtpSender.idl \
    255256    $(WebCore)/Modules/mediastream/RTCRtpTransceiver.idl \

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

    r235809 r235973  
    3636#include "JSDOMPromiseDeferred.h"
    3737#include "LibWebRTCProvider.h"
    38 #include "RTCRtpParameters.h"
     38#include "RTCRtpSendParameters.h"
    3939#include "RTCSessionDescription.h"
    4040#include "RTCSignalingState.h"

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpCodingParameters.h

    r235972 r235973  
    2828#if ENABLE(WEB_RTC)
    2929
    30 #include "RTCDegradationPreference.h"
    31 #include "RTCRtpCodecParameters.h"
    32 #include "RTCRtpEncodingParameters.h"
    33 #include "RTCRtpHeaderExtensionParameters.h"
    34 #include <wtf/Vector.h>
    3530#include <wtf/text/WTFString.h>
    3631
    3732namespace WebCore {
    3833
    39 struct RTCRtpParameters {
    40     String transactionId;
    41     Vector<RTCRtpEncodingParameters> encodings;
    42     Vector<RTCRtpHeaderExtensionParameters> headerExtensions;
    43     Vector<RTCRtpCodecParameters> codecs;
    44     RTCDegradationPreference degradationPreference { RTCDegradationPreference::Balanced };
     34struct RTCRtpCodingParameters {
     35    String rid;
    4536};
    46 
    4737
    4838} // namespace WebCore

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpCodingParameters.idl

    r235972 r235973  
    2828    EnabledAtRuntime=PeerConnection,
    2929    JSGenerateToJSObject,
    30 ] dictionary RTCRtpEncodingParameters {
    31     unsigned long ssrc;
    32     RTCRtpRtxParameters rtx;
    33     RTCRtpFecParameters fec;
    34     RTCDtxStatus dtx;
    35     boolean active;
    36     RTCPriorityType priority;
    37     unsigned long maxBitrate;
    38     unsigned long maxFramerate;
     30] dictionary RTCRtpCodingParameters {
    3931    DOMString rid;
    40     double scaleResolutionDownBy = 1;
    4132};

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpDecodingParameters.h

    r235972 r235973  
    2828#if ENABLE(WEB_RTC)
    2929
    30 #include "RTCDegradationPreference.h"
    31 #include "RTCRtpCodecParameters.h"
    32 #include "RTCRtpEncodingParameters.h"
    33 #include "RTCRtpHeaderExtensionParameters.h"
    34 #include <wtf/Vector.h>
    35 #include <wtf/text/WTFString.h>
     30#include "RTCRtpCodingParameters.h"
    3631
    3732namespace WebCore {
    3833
    39 struct RTCRtpParameters {
    40     String transactionId;
    41     Vector<RTCRtpEncodingParameters> encodings;
    42     Vector<RTCRtpHeaderExtensionParameters> headerExtensions;
    43     Vector<RTCRtpCodecParameters> codecs;
    44     RTCDegradationPreference degradationPreference { RTCDegradationPreference::Balanced };
     34struct RTCRtpDecodingParameters : RTCRtpCodingParameters {
    4535};
    46 
    4736
    4837} // namespace WebCore

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpDecodingParameters.idl

    r235972 r235973  
    2828    EnabledAtRuntime=PeerConnection,
    2929    JSGenerateToJSObject,
    30 ] dictionary RTCRtpEncodingParameters {
    31     unsigned long ssrc;
    32     RTCRtpRtxParameters rtx;
    33     RTCRtpFecParameters fec;
    34     RTCDtxStatus dtx;
    35     boolean active;
    36     RTCPriorityType priority;
    37     unsigned long maxBitrate;
    38     unsigned long maxFramerate;
    39     DOMString rid;
    40     double scaleResolutionDownBy = 1;
     30] dictionary RTCRtpDecodingParameters : RTCRtpCodingParameters {
    4131};

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.h

    r235945 r235973  
    3030#include "RTCDtxStatus.h"
    3131#include "RTCPriorityType.h"
     32#include "RTCRtpCodingParameters.h"
    3233#include "RTCRtpFecParameters.h"
    3334#include "RTCRtpRtxParameters.h"
    … …  
    3536namespace WebCore {
    3637
    37 struct RTCRtpEncodingParameters {
     38struct RTCRtpEncodingParameters : RTCRtpCodingParameters {
    3839    unsigned long ssrc { 0 };
    3940    RTCRtpRtxParameters rtx;
    … …  
    4445    unsigned long maxBitrate { 0 };
    4546    unsigned long maxFramerate { 0 };
    46     String rid;
    4747    double scaleResolutionDownBy { 1 };
    4848};

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpEncodingParameters.idl

    r235945 r235973  
    2828    EnabledAtRuntime=PeerConnection,
    2929    JSGenerateToJSObject,
    30 ] dictionary RTCRtpEncodingParameters {
     30] dictionary RTCRtpEncodingParameters : RTCRtpCodingParameters {
    3131    unsigned long ssrc;
    3232    RTCRtpRtxParameters rtx;
    … …  
    3737    unsigned long maxBitrate;
    3838    unsigned long maxFramerate;
    39     DOMString rid;
    4039    double scaleResolutionDownBy = 1;
    4140};

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpParameters.h

    r235945 r235973  
    2828#if ENABLE(WEB_RTC)
    2929
    30 #include "RTCDegradationPreference.h"
    3130#include "RTCRtpCodecParameters.h"
    32 #include "RTCRtpEncodingParameters.h"
    3331#include "RTCRtpHeaderExtensionParameters.h"
    3432#include <wtf/Vector.h>
    35 #include <wtf/text/WTFString.h>
    3633
    3734namespace WebCore {
    3835
    3936struct RTCRtpParameters {
    40     String transactionId;
    41     Vector<RTCRtpEncodingParameters> encodings;
    4237    Vector<RTCRtpHeaderExtensionParameters> headerExtensions;
    4338    Vector<RTCRtpCodecParameters> codecs;
    44     RTCDegradationPreference degradationPreference { RTCDegradationPreference::Balanced };
    4539};
    4640

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpParameters.idl

    r235945 r235973  
    2929    JSGenerateToJSObject,
    3030] dictionary RTCRtpParameters {
    31     DOMString transactionId;
    32     sequence<RTCRtpEncodingParameters> encodings;
    3331    sequence<RTCRtpHeaderExtensionParameters> headerExtensions;
    3432    // FIXME: Add RTCRtcpParameters rtcp;
    3533    sequence<RTCRtpCodecParameters> codecs;
    36     RTCDegradationPreference degradationPreference = "balanced";
    3734};

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp

    r235817 r235973  
    3434#if ENABLE(WEB_RTC)
    3535
    36 #include "RTCRtpParameters.h"
    37 
    3836namespace WebCore {
    3937

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpSendParameters.h

    r235972 r235973  
    11/*
    2  * Copyright (C) 2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2018 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2929
    3030#include "RTCDegradationPreference.h"
    31 #include "RTCRtpCodecParameters.h"
    3231#include "RTCRtpEncodingParameters.h"
    33 #include "RTCRtpHeaderExtensionParameters.h"
    34 #include <wtf/Vector.h>
     32#include "RTCRtpParameters.h"
    3533#include <wtf/text/WTFString.h>
    3634
    3735namespace WebCore {
    3836
    39 struct RTCRtpParameters {
     37struct RTCRtpSendParameters : RTCRtpParameters {
     38    RTCRtpSendParameters() = default;
     39    explicit RTCRtpSendParameters(RTCRtpParameters&& parameters)
     40        : RTCRtpParameters(WTFMove(parameters))
     41    {
     42    }
     43
    4044    String transactionId;
    4145    Vector<RTCRtpEncodingParameters> encodings;
    42     Vector<RTCRtpHeaderExtensionParameters> headerExtensions;
    43     Vector<RTCRtpCodecParameters> codecs;
    4446    RTCDegradationPreference degradationPreference { RTCDegradationPreference::Balanced };
    4547};

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpSendParameters.idl

    r235972 r235973  
    2828    EnabledAtRuntime=PeerConnection,
    2929    JSGenerateToJSObject,
    30 ] dictionary RTCRtpParameters {
    31     DOMString transactionId;
    32     sequence<RTCRtpEncodingParameters> encodings;
    33     sequence<RTCRtpHeaderExtensionParameters> headerExtensions;
    34     // FIXME: Add RTCRtcpParameters rtcp;
    35     sequence<RTCRtpCodecParameters> codecs;
     30] dictionary RTCRtpSendParameters : RTCRtpParameters {
     31    required DOMString transactionId;
     32    required sequence<RTCRtpEncodingParameters> encodings;
    3633    RTCDegradationPreference degradationPreference = "balanced";
    3734};

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

    r235817 r235973  
    9595}
    9696
    97 RTCRtpParameters RTCRtpSender::getParameters()
     97RTCRtpSendParameters RTCRtpSender::getParameters()
    9898{
    9999    if (isStopped())
    … …  
    102102}
    103103
    104 void RTCRtpSender::setParameters(const RTCRtpParameters& parameters, DOMPromiseDeferred<void>&& promise)
     104void RTCRtpSender::setParameters(const RTCRtpSendParameters& parameters, DOMPromiseDeferred<void>&& promise)
    105105{
    106106    if (isStopped()) {

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

    r235817 r235973  
    6060    void replaceTrack(ScriptExecutionContext&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&);
    6161
    62     RTCRtpParameters getParameters();
    63     void setParameters(const RTCRtpParameters&, DOMPromiseDeferred<void>&&);
     62    RTCRtpSendParameters getParameters();
     63    void setParameters(const RTCRtpSendParameters&, DOMPromiseDeferred<void>&&);
    6464
    6565    RTCRtpSenderBackend* backend() { return m_backend.get(); }

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpSender.idl

    r235817 r235973  
    4040    // FIXME 169662: missing getCapabilities
    4141    // FIXME 169662: missing setStreams
    42     RTCRtpParameters getParameters();
    43     Promise<void> setParameters(RTCRtpParameters parameters);
     42    RTCRtpSendParameters getParameters();
     43    Promise<void> setParameters(RTCRtpSendParameters parameters);
    4444    [CallWith=ScriptExecutionContext] Promise<void> replaceTrack(MediaStreamTrack? withTrack);
    4545};

  • trunk/Source/WebCore/Modules/mediastream/RTCRtpSenderBackend.h

    r235757 r235973  
    2828
    2929#include "JSDOMPromiseDeferred.h"
    30 #include "RTCRtpParameters.h"
    3130
    3231namespace WebCore {
    … …  
    3433class MediaStreamTrack;
    3534class RTCRtpSender;
     35struct RTCRtpSendParameters;
    3636class ScriptExecutionContext;
    3737
    … …  
    3939public:
    4040    virtual void replaceTrack(ScriptExecutionContext&, RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&) = 0;
    41     virtual RTCRtpParameters getParameters() const = 0;
    42     virtual void setParameters(const RTCRtpParameters&, DOMPromiseDeferred<void>&&) = 0;
     41    virtual RTCRtpSendParameters getParameters() const = 0;
     42    virtual void setParameters(const RTCRtpSendParameters&, DOMPromiseDeferred<void>&&) = 0;
    4343    virtual ~RTCRtpSenderBackend() = default;
    4444};

  • trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.cpp

    r235809 r235973  
    101101}
    102102
    103 RTCRtpParameters LibWebRTCRtpSenderBackend::getParameters() const
     103RTCRtpSendParameters LibWebRTCRtpSenderBackend::getParameters() const
    104104{
    105105    if (!m_rtcSender)
    106106        return { };
    107107
    108     return toRTCRtpParameters(m_rtcSender->GetParameters());
     108    return toRTCRtpSendParameters(m_rtcSender->GetParameters());
    109109}
    110110
    111 void LibWebRTCRtpSenderBackend::setParameters(const RTCRtpParameters& parameters, DOMPromiseDeferred<void>&& promise)
     111void LibWebRTCRtpSenderBackend::setParameters(const RTCRtpSendParameters& parameters, DOMPromiseDeferred<void>&& promise)
    112112{
    113113    if (!m_rtcSender) {
    … …  
    115115        return;
    116116    }
    117     auto error = m_rtcSender->SetParameters(fromRTCRtpParameters(parameters));
     117    auto error = m_rtcSender->SetParameters(fromRTCRtpSendParameters(parameters));
    118118    if (!error.ok()) {
    119119        promise.reject(Exception { InvalidStateError, error.message() });

  • trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h

    r235935 r235973  
    9797private:
    9898    void replaceTrack(ScriptExecutionContext&, RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&) final;
    99     RTCRtpParameters getParameters() const final;
    100     void setParameters(const RTCRtpParameters&, DOMPromiseDeferred<void>&&) final;
     99    RTCRtpSendParameters getParameters() const final;
     100    void setParameters(const RTCRtpSendParameters&, DOMPromiseDeferred<void>&&) final;
    101101
    102102    WeakPtr<LibWebRTCPeerConnectionBackend> m_peerConnectionBackend;

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

    r235945 r235973  
    3030#include "LibWebRTCMacros.h"
    3131#include "RTCPeerConnection.h"
    32 #include "RTCRtpParameters.h"
     32#include "RTCRtpSendParameters.h"
    3333#include <wtf/text/WTFString.h>
    3434
    … …  
    136136    RTCRtpParameters parameters;
    137137
    138     parameters.transactionId = fromStdString(rtcParameters.transaction_id);
    139     for (auto& rtcEncoding : rtcParameters.encodings)
    140         parameters.encodings.append(toRTCEncodingParameters(rtcEncoding));
    141138    for (auto& extension : rtcParameters.header_extensions)
    142139        parameters.headerExtensions.append(toRTCHeaderExtensionParameters(extension));
    143140    for (auto& codec : rtcParameters.codecs)
    144141        parameters.codecs.append(toRTCCodecParameters(codec));
     142
     143    return parameters;
     144}
     145
     146RTCRtpSendParameters toRTCRtpSendParameters(const webrtc::RtpParameters& rtcParameters)
     147{
     148    RTCRtpSendParameters parameters { toRTCRtpParameters(rtcParameters) };
     149
     150    parameters.transactionId = fromStdString(rtcParameters.transaction_id);
     151    for (auto& rtcEncoding : rtcParameters.encodings)
     152        parameters.encodings.append(toRTCEncodingParameters(rtcEncoding));
    145153
    146154    switch (rtcParameters.degradation_preference) {
    … …  
    160168}
    161169
    162 webrtc::RtpParameters fromRTCRtpParameters(const RTCRtpParameters& parameters)
     170webrtc::RtpParameters fromRTCRtpSendParameters(const RTCRtpSendParameters& parameters)
    163171{
    164172    webrtc::RtpParameters rtcParameters;

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

    r235809 r235973  
    3939
    4040struct RTCRtpParameters;
     41struct RTCRtpSendParameters;
    4142struct RTCRtpTransceiverInit;
    4243
    … …  
    4546RTCRtpParameters toRTCRtpParameters(const webrtc::RtpParameters&);
    4647webrtc::RtpParameters fromRTCRtpParameters(const RTCRtpParameters&);
     48RTCRtpSendParameters toRTCRtpSendParameters(const webrtc::RtpParameters&);
     49webrtc::RtpParameters fromRTCRtpSendParameters(const RTCRtpSendParameters&);
    4750
    4851RTCRtpTransceiverDirection toRTCRtpTransceiverDirection(webrtc::RtpTransceiverDirection);

  • trunk/Source/WebCore/Sources.txt

    r235945 r235973  
    28852885JSRTCRtpRtxParameters.cpp
    28862886JSRTCRtpReceiver.cpp
     2887JSRTCRtpSendParameters.cpp
    28872888JSRTCRtpSender.cpp
    28882889JSRTCRtpTransceiver.cpp

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r235945 r235973  
    72337233                4147E2B51C89912600A7E715 /* FetchLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchLoader.h; sourceTree = "<group>"; };
    72347234                4147E2B61C89912600A7E715 /* FetchLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchLoaderClient.h; sourceTree = "<group>"; };
     7235                414AD3FC2149842000521676 /* RTCRtpSendParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCRtpSendParameters.h; sourceTree = "<group>"; };
     7236                414AD3FE2149842000521676 /* RTCRtpSendParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpSendParameters.idl; sourceTree = "<group>"; };
     7237                414AD3FF21498D3000521676 /* RTCRtpCodingParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCRtpCodingParameters.h; sourceTree = "<group>"; };
     7238                414AD40021498D3100521676 /* RTCRtpDecodingParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCRtpDecodingParameters.h; sourceTree = "<group>"; };
     7239                414AD40121498D3100521676 /* RTCRtpDecodingParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpDecodingParameters.idl; sourceTree = "<group>"; };
     7240                414AD40221498D3200521676 /* RTCRtpCodingParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpCodingParameters.idl; sourceTree = "<group>"; };
    72357241                414B82021D6DF0D90077EBE3 /* StructuredClone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StructuredClone.cpp; sourceTree = "<group>"; };
    72367242                414B82031D6DF0D90077EBE3 /* StructuredClone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructuredClone.h; sourceTree = "<group>"; };
    … …  
    1518515191                                41FCB75F214866FF0038ADC6 /* RTCRtpCodecParameters.h */,
    1518615192                                41FCB759214865D30038ADC6 /* RTCRtpCodecParameters.idl */,
     15193                                414AD3FF21498D3000521676 /* RTCRtpCodingParameters.h */,
     15194                                414AD40221498D3200521676 /* RTCRtpCodingParameters.idl */,
     15195                                414AD40021498D3100521676 /* RTCRtpDecodingParameters.h */,
     15196                                414AD40121498D3100521676 /* RTCRtpDecodingParameters.idl */,
    1518715197                                41FCB761214867000038ADC6 /* RTCRtpEncodingParameters.h */,
    1518815198                                41E593FF214865AA00D3CB61 /* RTCRtpEncodingParameters.idl */,
    … …  
    1520315213                                5E2C435B1BCEE30D0001E2BC /* RTCRtpSender.idl */,
    1520415214                                41D1A046213EDDEB0063FB6B /* RTCRtpSenderBackend.h */,
     15215                                414AD3FC2149842000521676 /* RTCRtpSendParameters.h */,
     15216                                414AD3FE2149842000521676 /* RTCRtpSendParameters.idl */,
    1520515217                                5E5E2B101CFC3E4B000C0D85 /* RTCRtpTransceiver.cpp */,
    1520615218                                5E5E2B111CFC3E4B000C0D85 /* RTCRtpTransceiver.h */,
Note: See TracChangeset for help on using the changeset viewer.