webrtc/pc/channel.cc - Issue 1697163002: Remove conference_mode flag from AudioOptions and VideoOptions.

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: webrtc/pc/channel.cc

Issue 1697163002: Remove conference_mode flag from AudioOptions and VideoOptions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fix logic when SetSendParameters changes conference_mode but no options. Created 4 years, 10 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

Index: webrtc/pc/channel.cc

diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc

index 1dc8e7f6bdaa84dfbe9728b14e17d27500ac39de..6a696ea4b4f6f92271ed5914757e190bb4d5770f 100644

--- a/webrtc/pc/channel.cc

+++ b/webrtc/pc/channel.cc

@@ -1798,7 +1798,7 @@ bool VideoChannel::SetRemoteContent_w(const MediaContentDescription* content,

VideoSendParameters send_params = last_send_params_;

RtpSendParametersFromMediaDescription(video, &send_params);

if (video->conference_mode()) {

- send_params.options.conference_mode = rtc::Optional<bool>(true);

+ send_params.conference_mode = true;

}

if (!media_channel()->SetSendParameters(send_params)) {

SafeSetError("Failed to set remote video description send parameters.",

« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2_unittest.cc ('k') | no next file » | no next file with comments »