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

Side by Side Diff: webrtc/pc/mediasession.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: Disable GCM if ENABLE_EXTERNAL_AUTH is defined. Created 4 years, 5 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/channelmanager.cc ('k') | webrtc/pc/mediasession.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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 bool is_muc; 156 bool is_muc;
157 bool vad_enabled; 157 bool vad_enabled;
158 bool rtcp_mux_enabled; 158 bool rtcp_mux_enabled;
159 bool bundle_enabled; 159 bool bundle_enabled;
160 // bps. -1 == auto. 160 // bps. -1 == auto.
161 int video_bandwidth; 161 int video_bandwidth;
162 int data_bandwidth; 162 int data_bandwidth;
163 // content name ("mid") => options. 163 // content name ("mid") => options.
164 std::map<std::string, TransportOptions> transport_options; 164 std::map<std::string, TransportOptions> transport_options;
165 std::string rtcp_cname; 165 std::string rtcp_cname;
166 rtc::CryptoOptions crypto_options;
166 167
167 struct Stream { 168 struct Stream {
168 Stream(MediaType type, 169 Stream(MediaType type,
169 const std::string& id, 170 const std::string& id,
170 const std::string& sync_label, 171 const std::string& sync_label,
171 int num_sim_layers) 172 int num_sim_layers)
172 : type(type), id(id), sync_label(sync_label), 173 : type(type), id(id), sync_label(sync_label),
173 num_sim_layers(num_sim_layers) { 174 num_sim_layers(num_sim_layers) {
174 } 175 }
175 MediaType type; 176 MediaType type;
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 ContentInfo* GetFirstAudioContent(SessionDescription* sdesc); 588 ContentInfo* GetFirstAudioContent(SessionDescription* sdesc);
588 ContentInfo* GetFirstVideoContent(SessionDescription* sdesc); 589 ContentInfo* GetFirstVideoContent(SessionDescription* sdesc);
589 ContentInfo* GetFirstDataContent(SessionDescription* sdesc); 590 ContentInfo* GetFirstDataContent(SessionDescription* sdesc);
590 AudioContentDescription* GetFirstAudioContentDescription( 591 AudioContentDescription* GetFirstAudioContentDescription(
591 SessionDescription* sdesc); 592 SessionDescription* sdesc);
592 VideoContentDescription* GetFirstVideoContentDescription( 593 VideoContentDescription* GetFirstVideoContentDescription(
593 SessionDescription* sdesc); 594 SessionDescription* sdesc);
594 DataContentDescription* GetFirstDataContentDescription( 595 DataContentDescription* GetFirstDataContentDescription(
595 SessionDescription* sdesc); 596 SessionDescription* sdesc);
596 597
597 void GetSupportedAudioCryptoSuites(std::vector<int>* crypto_suites); 598 void GetSupportedAudioCryptoSuites(const rtc::CryptoOptions& crypto_options,
598 void GetSupportedVideoCryptoSuites(std::vector<int>* crypto_suites); 599 std::vector<int>* crypto_suites);
599 void GetSupportedDataCryptoSuites(std::vector<int>* crypto_suites); 600 void GetSupportedVideoCryptoSuites(const rtc::CryptoOptions& crypto_options,
600 void GetDefaultSrtpCryptoSuites(std::vector<int>* crypto_suites); 601 std::vector<int>* crypto_suites);
601 void GetSupportedAudioCryptoSuiteNames( 602 void GetSupportedDataCryptoSuites(const rtc::CryptoOptions& crypto_options,
603 std::vector<int>* crypto_suites);
604 void GetDefaultSrtpCryptoSuites(const rtc::CryptoOptions& crypto_options,
605 std::vector<int>* crypto_suites);
606 void GetSupportedAudioCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
602 std::vector<std::string>* crypto_suite_names); 607 std::vector<std::string>* crypto_suite_names);
603 void GetSupportedVideoCryptoSuiteNames( 608 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
604 std::vector<std::string>* crypto_suite_names); 609 std::vector<std::string>* crypto_suite_names);
605 void GetSupportedDataCryptoSuiteNames( 610 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
606 std::vector<std::string>* crypto_suite_names); 611 std::vector<std::string>* crypto_suite_names);
607 void GetDefaultSrtpCryptoSuiteNames( 612 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
608 std::vector<std::string>* crypto_suite_names); 613 std::vector<std::string>* crypto_suite_names);
609 614
610 } // namespace cricket 615 } // namespace cricket
611 616
612 #endif // WEBRTC_PC_MEDIASESSION_H_ 617 #endif // WEBRTC_PC_MEDIASESSION_H_
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager.cc ('k') | webrtc/pc/mediasession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698