| Index: webrtc/pc/peerconnectionfactory.cc
|
| diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
|
| index 8269a1ad85d818a32e1360afb5a803f24c3e57d2..f9e6dced50b409e5fa240672567fc41e2afa5103 100644
|
| --- a/webrtc/pc/peerconnectionfactory.cc
|
| +++ b/webrtc/pc/peerconnectionfactory.cc
|
| @@ -219,7 +219,6 @@ bool PeerConnectionFactory::Initialize() {
|
| std::move(media_engine), worker_thread_, network_thread_));
|
|
|
| channel_manager_->SetVideoRtxEnabled(true);
|
| - channel_manager_->SetCryptoOptions(options_.crypto_options);
|
| if (!channel_manager_->Init()) {
|
| return false;
|
| }
|
| @@ -229,9 +228,6 @@ bool PeerConnectionFactory::Initialize() {
|
|
|
| void PeerConnectionFactory::SetOptions(const Options& options) {
|
| options_ = options;
|
| - if (channel_manager_) {
|
| - channel_manager_->SetCryptoOptions(options.crypto_options);
|
| - }
|
| }
|
|
|
| rtc::scoped_refptr<AudioSourceInterface>
|
| @@ -370,9 +366,9 @@ cricket::TransportController* PeerConnectionFactory::CreateTransportController(
|
| cricket::PortAllocator* port_allocator,
|
| bool redetermine_role_on_ice_restart) {
|
| RTC_DCHECK(signaling_thread_->IsCurrent());
|
| - return new cricket::TransportController(signaling_thread_, network_thread_,
|
| - port_allocator,
|
| - redetermine_role_on_ice_restart);
|
| + return new cricket::TransportController(
|
| + signaling_thread_, network_thread_, port_allocator,
|
| + redetermine_role_on_ice_restart, options_.crypto_options);
|
| }
|
|
|
| rtc::Thread* PeerConnectionFactory::signaling_thread() {
|
|
|