Chromium Code Reviews| Index: talk/session/media/mediasession.h |
| diff --git a/talk/session/media/mediasession.h b/talk/session/media/mediasession.h |
| index 8a7f4ccf06758db5453b84c43bfadc1f2dceddd6..29474603f8f6d8685da1dbe6a8b812fe989a066c 100644 |
| --- a/talk/session/media/mediasession.h |
| +++ b/talk/session/media/mediasession.h |
| @@ -103,7 +103,8 @@ struct MediaSessionOptions { |
| rtcp_mux_enabled(true), |
| bundle_enabled(false), |
| video_bandwidth(kAutoBandwidth), |
| - data_bandwidth(kDataMaxBandwidth) { |
| + data_bandwidth(kDataMaxBandwidth), |
| + enable_gcm_ciphers(false) { |
|
pthatcher1
2015/12/18 20:31:32
Same here: can you change it to enable_gcm_crypto_
joachim
2015/12/19 15:26:23
Done.
|
| } |
| bool has_audio() const { |
| @@ -144,6 +145,7 @@ struct MediaSessionOptions { |
| // bps. -1 == auto. |
| int video_bandwidth; |
| int data_bandwidth; |
| + bool enable_gcm_ciphers; |
| TransportOptions transport_options; |
| struct Stream { |
| @@ -555,6 +557,8 @@ void GetSupportedDataCryptoSuiteNames( |
| std::vector<std::string>* crypto_suite_names); |
| void GetDefaultSrtpCryptoSuiteNames( |
| std::vector<std::string>* crypto_suite_names); |
| +void FilterGcmCiphers(std::vector<int>* crypto_suites); |
| +void FilterGcmCipherNames(std::vector<std::string>* crypto_suites); |
| } // namespace cricket |