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

Side by Side Diff: webrtc/pc/channelmanager.h

Issue 2815513012: Negotiate the same SRTP crypto suites for every DTLS association formed. (Closed)
Patch Set: Merge with master Created 3 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 unified diff | Download patch
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 // Indicates whether any channels exist. 140 // Indicates whether any channels exist.
141 bool has_channels() const { 141 bool has_channels() const {
142 return (!voice_channels_.empty() || !video_channels_.empty()); 142 return (!voice_channels_.empty() || !video_channels_.empty());
143 } 143 }
144 144
145 // RTX will be enabled/disabled in engines that support it. The supporting 145 // RTX will be enabled/disabled in engines that support it. The supporting
146 // engines will start offering an RTX codec. Must be called before Init(). 146 // engines will start offering an RTX codec. Must be called before Init().
147 bool SetVideoRtxEnabled(bool enable); 147 bool SetVideoRtxEnabled(bool enable);
148 148
149 // Define crypto options to set on newly created channels. Doesn't change
150 // options on already created channels.
151 bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
152
153 // Starts/stops the local microphone and enables polling of the input level. 149 // Starts/stops the local microphone and enables polling of the input level.
154 bool capturing() const { return capturing_; } 150 bool capturing() const { return capturing_; }
155 151
156 // The operations below occur on the main thread. 152 // The operations below occur on the main thread.
157 153
158 // Starts AEC dump using existing file, with a specified maximum file size in 154 // Starts AEC dump using existing file, with a specified maximum file size in
159 // bytes. When the limit is reached, logging will stop and the file will be 155 // bytes. When the limit is reached, logging will stop and the file will be
160 // closed. If max_size_bytes is set to <= 0, no limit will be used. 156 // closed. If max_size_bytes is set to <= 0, no limit will be used.
161 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes); 157 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes);
162 158
163 // Stops recording AEC dump. 159 // Stops recording AEC dump.
164 void StopAecDump(); 160 void StopAecDump();
165 161
166 private: 162 private:
167 typedef std::vector<VoiceChannel*> VoiceChannels; 163 typedef std::vector<VoiceChannel*> VoiceChannels;
168 typedef std::vector<VideoChannel*> VideoChannels; 164 typedef std::vector<VideoChannel*> VideoChannels;
169 typedef std::vector<RtpDataChannel*> RtpDataChannels; 165 typedef std::vector<RtpDataChannel*> RtpDataChannels;
170 166
171 void Construct(std::unique_ptr<MediaEngineInterface> me, 167 void Construct(std::unique_ptr<MediaEngineInterface> me,
172 std::unique_ptr<DataEngineInterface> dme, 168 std::unique_ptr<DataEngineInterface> dme,
173 rtc::Thread* worker_thread, 169 rtc::Thread* worker_thread,
174 rtc::Thread* network_thread); 170 rtc::Thread* network_thread);
175 bool InitMediaEngine_w(); 171 bool InitMediaEngine_w();
176 void DestructorDeletes_w(); 172 void DestructorDeletes_w();
177 void Terminate_w(); 173 void Terminate_w();
178 bool SetCryptoOptions_w(const rtc::CryptoOptions& crypto_options);
179 VoiceChannel* CreateVoiceChannel_w( 174 VoiceChannel* CreateVoiceChannel_w(
180 webrtc::MediaControllerInterface* media_controller, 175 webrtc::MediaControllerInterface* media_controller,
181 DtlsTransportInternal* rtp_dtls_transport, 176 DtlsTransportInternal* rtp_dtls_transport,
182 DtlsTransportInternal* rtcp_dtls_transport, 177 DtlsTransportInternal* rtcp_dtls_transport,
183 rtc::PacketTransportInternal* rtp_packet_transport, 178 rtc::PacketTransportInternal* rtp_packet_transport,
184 rtc::PacketTransportInternal* rtcp_packet_transport, 179 rtc::PacketTransportInternal* rtcp_packet_transport,
185 rtc::Thread* signaling_thread, 180 rtc::Thread* signaling_thread,
186 const std::string& content_name, 181 const std::string& content_name,
187 bool srtp_required, 182 bool srtp_required,
188 const AudioOptions& options); 183 const AudioOptions& options);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 215
221 bool enable_rtx_; 216 bool enable_rtx_;
222 rtc::CryptoOptions crypto_options_; 217 rtc::CryptoOptions crypto_options_;
223 218
224 bool capturing_; 219 bool capturing_;
225 }; 220 };
226 221
227 } // namespace cricket 222 } // namespace cricket
228 223
229 #endif // WEBRTC_PC_CHANNELMANAGER_H_ 224 #endif // WEBRTC_PC_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698