webrtc/media/engine/webrtcvideoengine2.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/engine/webrtcvideoengine2.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/engine/webrtcvideoengine2.h

diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h

index 16b7cc51577f306433e353df2565a1e700459a13..aef908a7dda36d64caab2741838a61b5cd344b2c 100644

--- a/webrtc/media/engine/webrtcvideoengine2.h

+++ b/webrtc/media/engine/webrtcvideoengine2.h

@@ -192,6 +192,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,

rtc::Optional<VideoCodecSettings> codec;

rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions;

rtc::Optional<int> max_bandwidth_bps;

+ rtc::Optional<bool> conference_mode;

rtc::Optional<VideoOptions> options;

rtc::Optional<webrtc::RtcpMode> rtcp_mode;

};

@@ -273,6 +274,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,

webrtc::VideoSendStream::Config config;

VideoOptions options;

int max_bitrate_bps;

+ bool conference_mode;

rtc::Optional<VideoCodecSettings> codec_settings;

// Sent resolutions + bitrates etc. by the underlying VideoSendStream,

// typically changes when setting a new resolution or reconfiguring

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