| Index: webrtc/pc/mediasession.h
|
| diff --git a/webrtc/pc/mediasession.h b/webrtc/pc/mediasession.h
|
| index 6ac74f2d335dadca819b3c4acfca7209de7a6bb1..1211e7b9e9c12cfa0d7183748f4ac1134e7a6d00 100644
|
| --- a/webrtc/pc/mediasession.h
|
| +++ b/webrtc/pc/mediasession.h
|
| @@ -131,6 +131,7 @@ struct MediaSessionOptions {
|
| // bps. -1 == auto.
|
| int video_bandwidth;
|
| int data_bandwidth;
|
| + rtc::CryptoOptions crypto_options;
|
| // content name ("mid") => options.
|
| std::map<std::string, TransportOptions> transport_options;
|
|
|
| @@ -529,17 +530,21 @@ const VideoContentDescription* GetFirstVideoContentDescription(
|
| const DataContentDescription* GetFirstDataContentDescription(
|
| const SessionDescription* sdesc);
|
|
|
| -void GetSupportedAudioCryptoSuites(std::vector<int>* crypto_suites);
|
| -void GetSupportedVideoCryptoSuites(std::vector<int>* crypto_suites);
|
| -void GetSupportedDataCryptoSuites(std::vector<int>* crypto_suites);
|
| -void GetDefaultSrtpCryptoSuites(std::vector<int>* crypto_suites);
|
| -void GetSupportedAudioCryptoSuiteNames(
|
| +void GetSupportedAudioCryptoSuites(const rtc::CryptoOptions& crypto_options,
|
| + std::vector<int>* crypto_suites);
|
| +void GetSupportedVideoCryptoSuites(const rtc::CryptoOptions& crypto_options,
|
| + std::vector<int>* crypto_suites);
|
| +void GetSupportedDataCryptoSuites(const rtc::CryptoOptions& crypto_options,
|
| + std::vector<int>* crypto_suites);
|
| +void GetDefaultSrtpCryptoSuites(const rtc::CryptoOptions& crypto_options,
|
| + std::vector<int>* crypto_suites);
|
| +void GetSupportedAudioCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
|
| std::vector<std::string>* crypto_suite_names);
|
| -void GetSupportedVideoCryptoSuiteNames(
|
| +void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
|
| std::vector<std::string>* crypto_suite_names);
|
| -void GetSupportedDataCryptoSuiteNames(
|
| +void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
|
| std::vector<std::string>* crypto_suite_names);
|
| -void GetDefaultSrtpCryptoSuiteNames(
|
| +void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
|
| std::vector<std::string>* crypto_suite_names);
|
|
|
| } // namespace cricket
|
|
|