| Index: talk/session/media/channelmanager.cc
|
| diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc
|
| index bd89a41328cb345728bdec0912b4f230a3242a94..3324fb710ce02641d0f03e762d41e0091a151019 100644
|
| --- a/talk/session/media/channelmanager.cc
|
| +++ b/talk/session/media/channelmanager.cc
|
| @@ -142,6 +142,12 @@ bool ChannelManager::SetVideoRtxEnabled(bool enable) {
|
| }
|
| }
|
|
|
| +bool ChannelManager::SetCryptoOptions(
|
| + const rtc::CryptoOptions& crypto_options) {
|
| + crypto_options_ = crypto_options;
|
| + return true;
|
| +}
|
| +
|
| void ChannelManager::GetSupportedAudioCodecs(
|
| std::vector<AudioCodec>* codecs) const {
|
| codecs->clear();
|
| @@ -275,6 +281,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;
|
| @@ -333,6 +340,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;
|
| @@ -391,6 +399,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;
|
|
|