webrtc/media/base/videoengine_unittest.h - 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/base/videoengine_unittest.h

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/base/videoengine_unittest.h

diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h

index 659e7e0a25fd025ef7ab243b6b3f55f93cbd7a1a..0b190543e174d6df397b5f5b30d9072c908edac5 100644

--- a/webrtc/media/base/videoengine_unittest.h

+++ b/webrtc/media/base/videoengine_unittest.h

@@ -494,7 +494,7 @@ class VideoMediaChannelTest : public testing::Test,

EXPECT_TRUE(SetOneCodec(DefaultCodec()));

cricket::VideoSendParameters parameters;

parameters.codecs.push_back(DefaultCodec());

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

+ parameters.conference_mode = true;

EXPECT_TRUE(channel_->SetSendParameters(parameters));

EXPECT_TRUE(SetSend(true));

EXPECT_TRUE(channel_->AddRecvStream(

@@ -545,7 +545,7 @@ class VideoMediaChannelTest : public testing::Test,

EXPECT_TRUE(SetOneCodec(DefaultCodec()));

cricket::VideoSendParameters parameters;

parameters.codecs.push_back(DefaultCodec());

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

+ parameters.conference_mode = true;

EXPECT_TRUE(channel_->SetSendParameters(parameters));

EXPECT_TRUE(channel_->AddRecvStream(

cricket::StreamParams::CreateLegacy(kSsrc)));

@@ -725,7 +725,7 @@ class VideoMediaChannelTest : public testing::Test,

EXPECT_TRUE(SetDefaultCodec());

cricket::VideoSendParameters parameters;

parameters.codecs.push_back(DefaultCodec());

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

+ parameters.conference_mode = true;

EXPECT_TRUE(channel_->SetSendParameters(parameters));

EXPECT_TRUE(SetSend(true));

EXPECT_TRUE(channel_->AddRecvStream(

« no previous file with comments | « webrtc/media/base/mediachannel.h ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »