| Index: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| index 0467f453ddb6a74f46e8bff4698283804afe146b..2940ebf9a1d657bfd7d76a9507b718e07738822d 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| @@ -91,6 +91,7 @@
|
| #include "public/platform/WebRTCVoidRequest.h"
|
| #include "wtf/CurrentTime.h"
|
|
|
| +#include <algorithm>
|
| #include <memory>
|
|
|
| namespace blink {
|
| @@ -141,7 +142,8 @@ bool isIceCandidateMissingSdp(const RTCIceCandidateInitOrRTCIceCandidate& candid
|
| WebRTCOfferOptions convertToWebRTCOfferOptions(const RTCOfferOptions& options)
|
| {
|
| return WebRTCOfferOptions(RTCOfferOptionsPlatform::create(
|
| - -1, -1,
|
| + options.hasOfferToReceiveVideo() ? std::max(options.offerToReceiveVideo(), 0) : -1,
|
| + options.hasOfferToReceiveAudio() ? std::max(options.offerToReceiveAudio(), 0) : -1,
|
| options.hasVoiceActivityDetection() ? options.voiceActivityDetection() : true,
|
| options.hasIceRestart() ? options.iceRestart() : false));
|
| }
|
| @@ -149,6 +151,8 @@ WebRTCOfferOptions convertToWebRTCOfferOptions(const RTCOfferOptions& options)
|
| WebRTCAnswerOptions convertToWebRTCAnswerOptions(const RTCAnswerOptions& options)
|
| {
|
| return WebRTCAnswerOptions(RTCAnswerOptionsPlatform::create(
|
| + options.hasOfferToReceiveVideo() ? std::max(options.offerToReceiveVideo(), 0) : -1,
|
| + options.hasOfferToReceiveAudio() ? std::max(options.offerToReceiveAudio(), 0) : -1,
|
| options.hasVoiceActivityDetection() ? options.voiceActivityDetection() : true));
|
| }
|
|
|
|
|