diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc index c0686e4cdf2..3de725f63a4 100644 --- a/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc +++ b/chromium/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc @@ -8,7 +8,6 @@ #include <string> #include <tuple> #include <utility> -#include <vector> #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/web_rtc_dtmf_sender_handler.h" @@ -240,12 +239,11 @@ double PriorityToDouble(const WTF::String& priority) { return result; } -std::tuple<std::vector<webrtc::RtpEncodingParameters>, - webrtc::DegradationPreference> +std::tuple<Vector<webrtc::RtpEncodingParameters>, webrtc::DegradationPreference> ToRtpParameters(const RTCRtpSendParameters* parameters) { - std::vector<webrtc::RtpEncodingParameters> encodings; + Vector<webrtc::RtpEncodingParameters> encodings; if (parameters->hasEncodings()) { - encodings.reserve(parameters->encodings().size()); + encodings.ReserveCapacity(parameters->encodings().size()); for (const auto& encoding : parameters->encodings()) { encodings.push_back(ToRtpEncodingParameters(encoding)); @@ -265,7 +263,7 @@ webrtc::RtpEncodingParameters ToRtpEncodingParameters( // codecPayloadType, dtx, ptime, maxFramerate, scaleResolutionDownBy. webrtc::RtpEncodingParameters webrtc_encoding; if (encoding->hasRid()) { - webrtc_encoding.rid = WebString(encoding->rid()).Utf8(); + webrtc_encoding.rid = encoding->rid().Utf8(); } webrtc_encoding.active = encoding->active(); webrtc_encoding.bitrate_priority = PriorityToDouble(encoding->priority()); @@ -295,7 +293,7 @@ RTCRtpCodecParameters* ToRtpCodecParameters( const webrtc::RtpCodecParameters& webrtc_codec) { RTCRtpCodecParameters* codec = RTCRtpCodecParameters::Create(); codec->setPayloadType(webrtc_codec.payload_type); - codec->setMimeType(WTF::String::FromUTF8(webrtc_codec.mime_type().c_str())); + codec->setMimeType(WTF::String::FromUTF8(webrtc_codec.mime_type())); if (webrtc_codec.clock_rate) codec->setClockRate(webrtc_codec.clock_rate.value()); if (webrtc_codec.num_channels) @@ -448,7 +446,7 @@ ScriptPromise RTCRtpSender::setParameters( // field and the degradationPreference field. We just forward those to the // native layer without having to transform all the other read-only // parameters. - std::vector<webrtc::RtpEncodingParameters> encodings; + Vector<webrtc::RtpEncodingParameters> encodings; webrtc::DegradationPreference degradation_preference; std::tie(encodings, degradation_preference) = ToRtpParameters(parameters); @@ -564,7 +562,7 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(const String& kind) { SafeCast<wtf_size_t>(rtc_capabilities->codecs.size())); for (const auto& rtc_codec : rtc_capabilities->codecs) { auto* codec = RTCRtpCodecCapability::Create(); - codec->setMimeType(WTF::String::FromUTF8(rtc_codec.mime_type().c_str())); + codec->setMimeType(WTF::String::FromUTF8(rtc_codec.mime_type())); if (rtc_codec.clock_rate) codec->setClockRate(rtc_codec.clock_rate.value()); if (rtc_codec.num_channels) @@ -587,8 +585,7 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(const String& kind) { SafeCast<wtf_size_t>(rtc_capabilities->header_extensions.size())); for (const auto& rtc_header_extension : rtc_capabilities->header_extensions) { auto* header_extension = RTCRtpHeaderExtensionCapability::Create(); - header_extension->setUri( - WTF::String::FromUTF8(rtc_header_extension.uri.c_str())); + header_extension->setUri(WTF::String::FromUTF8(rtc_header_extension.uri)); header_extensions.push_back(header_extension); } capabilities->setHeaderExtensions(header_extensions); |