webrtc/media/engine/webrtcvideoengine2_unittest.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/media/engine/webrtcvideoengine2_unittest.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/media/engine/webrtcvideoengine2_unittest.cc

diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc

index 65b5c6b1e11ebed287b56b050da318527e14fc7b..70ddad2b6518da3fbcffd8b39705f1ee8f28e8f3 100644

--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc

+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc

@@ -1069,7 +1069,7 @@ TEST_F(WebRtcVideoChannel2Test, RecvStreamWithSimAndRtx) {

parameters.codecs = engine_.codecs();

EXPECT_TRUE(channel_->SetSendParameters(parameters));

EXPECT_TRUE(channel_->SetSend(true));

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

+ parameters.conference_mode = true;

EXPECT_TRUE(channel_->SetSendParameters(parameters));

// Send side.

@@ -1513,7 +1513,7 @@ TEST_F(WebRtcVideoChannel2Test,

ConferenceModeScreencastConfiguresTemporalLayer) {

static const int kConferenceScreencastTemporalBitrateBps =

ScreenshareLayerConfig::GetDefault().tl0_bitrate_kbps * 1000;

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

+ send_parameters_.conference_mode = true;

channel_->SetSendParameters(send_parameters_);

AddSendStream();

« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »