Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Side by Side 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: Feedback from Matt Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 bool has_channels() const { 105 bool has_channels() const {
106 return (!voice_channels_.empty() || !video_channels_.empty()); 106 return (!voice_channels_.empty() || !video_channels_.empty());
107 } 107 }
108 108
109 bool GetOutputVolume(int* level); 109 bool GetOutputVolume(int* level);
110 bool SetOutputVolume(int level); 110 bool SetOutputVolume(int level);
111 // RTX will be enabled/disabled in engines that support it. The supporting 111 // RTX will be enabled/disabled in engines that support it. The supporting
112 // engines will start offering an RTX codec. Must be called before Init(). 112 // engines will start offering an RTX codec. Must be called before Init().
113 bool SetVideoRtxEnabled(bool enable); 113 bool SetVideoRtxEnabled(bool enable);
114 114
115 // Define crypto options to set on newly created channels. Doesn't change
116 // options on already created channels.
117 bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
118
115 // Starts/stops the local microphone and enables polling of the input level. 119 // Starts/stops the local microphone and enables polling of the input level.
116 bool capturing() const { return capturing_; } 120 bool capturing() const { return capturing_; }
117 121
118 // The operations below occur on the main thread. 122 // The operations below occur on the main thread.
119 123
120 // Starts AEC dump using existing file, with a specified maximum file size in 124 // Starts AEC dump using existing file, with a specified maximum file size in
121 // bytes. When the limit is reached, logging will stop and the file will be 125 // bytes. When the limit is reached, logging will stop and the file will be
122 // closed. If max_size_bytes is set to <= 0, no limit will be used. 126 // closed. If max_size_bytes is set to <= 0, no limit will be used.
123 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes); 127 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes);
124 128
(...skipping 10 matching lines...) Expand all
135 typedef std::vector<VoiceChannel*> VoiceChannels; 139 typedef std::vector<VoiceChannel*> VoiceChannels;
136 typedef std::vector<VideoChannel*> VideoChannels; 140 typedef std::vector<VideoChannel*> VideoChannels;
137 typedef std::vector<DataChannel*> DataChannels; 141 typedef std::vector<DataChannel*> DataChannels;
138 142
139 void Construct(MediaEngineInterface* me, 143 void Construct(MediaEngineInterface* me,
140 DataEngineInterface* dme, 144 DataEngineInterface* dme,
141 rtc::Thread* worker_thread); 145 rtc::Thread* worker_thread);
142 bool InitMediaEngine_w(); 146 bool InitMediaEngine_w();
143 void DestructorDeletes_w(); 147 void DestructorDeletes_w();
144 void Terminate_w(); 148 void Terminate_w();
149 bool SetCryptoOptions_w(const rtc::CryptoOptions& crypto_options);
145 VoiceChannel* CreateVoiceChannel_w( 150 VoiceChannel* CreateVoiceChannel_w(
146 webrtc::MediaControllerInterface* media_controller, 151 webrtc::MediaControllerInterface* media_controller,
147 TransportController* transport_controller, 152 TransportController* transport_controller,
148 const std::string& content_name, 153 const std::string& content_name,
149 bool rtcp, 154 bool rtcp,
150 const AudioOptions& options); 155 const AudioOptions& options);
151 void DestroyVoiceChannel_w(VoiceChannel* voice_channel); 156 void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
152 VideoChannel* CreateVideoChannel_w( 157 VideoChannel* CreateVideoChannel_w(
153 webrtc::MediaControllerInterface* media_controller, 158 webrtc::MediaControllerInterface* media_controller,
154 TransportController* transport_controller, 159 TransportController* transport_controller,
(...skipping 12 matching lines...) Expand all
167 bool initialized_; 172 bool initialized_;
168 rtc::Thread* main_thread_; 173 rtc::Thread* main_thread_;
169 rtc::Thread* worker_thread_; 174 rtc::Thread* worker_thread_;
170 175
171 VoiceChannels voice_channels_; 176 VoiceChannels voice_channels_;
172 VideoChannels video_channels_; 177 VideoChannels video_channels_;
173 DataChannels data_channels_; 178 DataChannels data_channels_;
174 179
175 int audio_output_volume_; 180 int audio_output_volume_;
176 bool enable_rtx_; 181 bool enable_rtx_;
182 rtc::CryptoOptions crypto_options_;
177 183
178 bool capturing_; 184 bool capturing_;
179 }; 185 };
180 186
181 } // namespace cricket 187 } // namespace cricket
182 188
183 #endif // WEBRTC_PC_CHANNELMANAGER_H_ 189 #endif // WEBRTC_PC_CHANNELMANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698