webrtc/pc/channelmanager.h - Issue 1528843005: Add support for GCM cipher suites from RFC 7714.

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/channelmanager.h

Issue 1528843005: Add support for GCM cipher suites from RFC 7714. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fix failing SRTP-but-no-DTLS tests. Created 4 years, 8 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/channelmanager.h

diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h

index 72a2f056b5a4c0b6bb797f1a5792f575bb8a9ee3..62c0624b2747705bffd9ae6158933425a22d3f58 100644

--- a/webrtc/pc/channelmanager.h

+++ b/webrtc/pc/channelmanager.h

@@ -111,6 +111,7 @@ class ChannelManager {

// RTX will be enabled/disabled in engines that support it. The supporting

// engines will start offering an RTX codec. Must be called before Init().

bool SetVideoRtxEnabled(bool enable);

+ bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);

// Starts/stops the local microphone and enables polling of the input level.

bool capturing() const { return capturing_; }

@@ -174,6 +175,7 @@ class ChannelManager {

int audio_output_volume_;

bool enable_rtx_;

+ rtc::CryptoOptions crypto_options_;

mattdr 2016/05/06 22:34:14 Again, I'd prefer to have a more explicit default

joachim 2016/05/09 23:21:40 Done.

bool capturing_;

};

« webrtc/pc/channel_unittest.cc ('K') | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/channelmanager.cc » ('j') | webrtc/pc/channelmanager.cc » ('J')