Chromium Code Reviews| Index: webrtc/pc/channelmanager.cc |
| diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc |
| index f59a3df9c72f7059e0c1a66aed639a66e2dbe518..3dc6dcd7d3ee3abe9af9f454a1804c80d1af6abb 100644 |
| --- a/webrtc/pc/channelmanager.cc |
| +++ b/webrtc/pc/channelmanager.cc |
| @@ -99,6 +99,12 @@ bool ChannelManager::SetVideoRtxEnabled(bool enable) { |
| } |
| } |
| +bool ChannelManager::SetCryptoOptions( |
| + const rtc::CryptoOptions& crypto_options) { |
| + crypto_options_ = crypto_options; |
|
mattdr
2016/05/06 22:34:14
Maybe this should fail or log if there are active
joachim
2016/05/09 23:21:40
Done (added warning log and comment in header but
|
| + return true; |
| +} |
| + |
| void ChannelManager::GetSupportedAudioCodecs( |
| std::vector<AudioCodec>* codecs) const { |
| codecs->clear(); |
| @@ -230,6 +236,7 @@ VoiceChannel* ChannelManager::CreateVoiceChannel_w( |
| VoiceChannel* voice_channel = |
| new VoiceChannel(worker_thread_, media_engine_.get(), media_channel, |
| transport_controller, content_name, rtcp); |
| + voice_channel->SetCryptoOptions(crypto_options_); |
| if (!voice_channel->Init()) { |
| delete voice_channel; |
| return nullptr; |
| @@ -288,6 +295,7 @@ VideoChannel* ChannelManager::CreateVideoChannel_w( |
| VideoChannel* video_channel = new VideoChannel( |
| worker_thread_, media_channel, transport_controller, content_name, rtcp); |
| + video_channel->SetCryptoOptions(crypto_options_); |
| if (!video_channel->Init()) { |
| delete video_channel; |
| return NULL; |
| @@ -346,6 +354,7 @@ DataChannel* ChannelManager::CreateDataChannel_w( |
| DataChannel* data_channel = new DataChannel( |
| worker_thread_, media_channel, transport_controller, content_name, rtcp); |
| + data_channel->SetCryptoOptions(crypto_options_); |
| if (!data_channel->Init()) { |
| LOG(LS_WARNING) << "Failed to init data channel."; |
| delete data_channel; |