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

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: 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 bool recv_audio; 124 bool recv_audio;
125 bool recv_video; 125 bool recv_video;
126 DataChannelType data_channel_type; 126 DataChannelType data_channel_type;
127 bool is_muc; 127 bool is_muc;
128 bool vad_enabled; 128 bool vad_enabled;
129 bool rtcp_mux_enabled; 129 bool rtcp_mux_enabled;
130 bool bundle_enabled; 130 bool bundle_enabled;
131 // bps. -1 == auto. 131 // bps. -1 == auto.
132 int video_bandwidth; 132 int video_bandwidth;
133 int data_bandwidth; 133 int data_bandwidth;
134 rtc::CryptoOptions crypto_options;
134 // content name ("mid") => options. 135 // content name ("mid") => options.
135 std::map<std::string, TransportOptions> transport_options; 136 std::map<std::string, TransportOptions> transport_options;
136 137
137 struct Stream { 138 struct Stream {
138 Stream(MediaType type, 139 Stream(MediaType type,
139 const std::string& id, 140 const std::string& id,
140 const std::string& sync_label, 141 const std::string& sync_label,
141 int num_sim_layers) 142 int num_sim_layers)
142 : type(type), id(id), sync_label(sync_label), 143 : type(type), id(id), sync_label(sync_label),
143 num_sim_layers(num_sim_layers) { 144 num_sim_layers(num_sim_layers) {
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc); 523 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc);
523 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc); 524 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc);
524 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc); 525 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc);
525 const AudioContentDescription* GetFirstAudioContentDescription( 526 const AudioContentDescription* GetFirstAudioContentDescription(
526 const SessionDescription* sdesc); 527 const SessionDescription* sdesc);
527 const VideoContentDescription* GetFirstVideoContentDescription( 528 const VideoContentDescription* GetFirstVideoContentDescription(
528 const SessionDescription* sdesc); 529 const SessionDescription* sdesc);
529 const DataContentDescription* GetFirstDataContentDescription( 530 const DataContentDescription* GetFirstDataContentDescription(
530 const SessionDescription* sdesc); 531 const SessionDescription* sdesc);
531 532
532 void GetSupportedAudioCryptoSuites(std::vector<int>* crypto_suites); 533 void GetSupportedAudioCryptoSuites(const rtc::CryptoOptions& crypto_options,
533 void GetSupportedVideoCryptoSuites(std::vector<int>* crypto_suites); 534 std::vector<int>* crypto_suites);
534 void GetSupportedDataCryptoSuites(std::vector<int>* crypto_suites); 535 void GetSupportedVideoCryptoSuites(const rtc::CryptoOptions& crypto_options,
535 void GetDefaultSrtpCryptoSuites(std::vector<int>* crypto_suites); 536 std::vector<int>* crypto_suites);
536 void GetSupportedAudioCryptoSuiteNames( 537 void GetSupportedDataCryptoSuites(const rtc::CryptoOptions& crypto_options,
538 std::vector<int>* crypto_suites);
539 void GetDefaultSrtpCryptoSuites(const rtc::CryptoOptions& crypto_options,
540 std::vector<int>* crypto_suites);
541 void GetSupportedAudioCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
537 std::vector<std::string>* crypto_suite_names); 542 std::vector<std::string>* crypto_suite_names);
538 void GetSupportedVideoCryptoSuiteNames( 543 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
539 std::vector<std::string>* crypto_suite_names); 544 std::vector<std::string>* crypto_suite_names);
540 void GetSupportedDataCryptoSuiteNames( 545 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
541 std::vector<std::string>* crypto_suite_names); 546 std::vector<std::string>* crypto_suite_names);
542 void GetDefaultSrtpCryptoSuiteNames( 547 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
543 std::vector<std::string>* crypto_suite_names); 548 std::vector<std::string>* crypto_suite_names);
544 549
545 } // namespace cricket 550 } // namespace cricket
546 551
547 #endif // WEBRTC_PC_MEDIASESSION_H_ 552 #endif // WEBRTC_PC_MEDIASESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698