third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp - Issue 2077323003: Support legacy offerToReceiveAudio/offerToReceiveVideo fields in RTCOfferOptions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp

Issue 2077323003: Support legacy offerToReceiveAudio/offerToReceiveVideo fields in RTCOfferOptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-promise.html ('K') | « third_party/WebKit/Source/modules/mediastream/RTCOfferOptions.idl ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a421337bda3627f12b72e769612b78abc9b2fb1c..c6886bc53f2468fc6db5a1d1e0a6e74cb2c255e5 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 "wtf/PtrUtil.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));

}