OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 | 623 |
624 if (configuration.tcp_candidate_policy == kTcpCandidatePolicyDisabled) { | 624 if (configuration.tcp_candidate_policy == kTcpCandidatePolicyDisabled) { |
625 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_TCP; | 625 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_TCP; |
626 LOG(LS_INFO) << "TCP candidates are disabled."; | 626 LOG(LS_INFO) << "TCP candidates are disabled."; |
627 } | 627 } |
628 | 628 |
629 port_allocator_->set_flags(portallocator_flags); | 629 port_allocator_->set_flags(portallocator_flags); |
630 // No step delay is used while allocating ports. | 630 // No step delay is used while allocating ports. |
631 port_allocator_->set_step_delay(cricket::kMinimumStepDelay); | 631 port_allocator_->set_step_delay(cricket::kMinimumStepDelay); |
632 | 632 |
| 633 media_controller_.reset(factory_->CreateMediaController()); |
| 634 |
633 remote_stream_factory_.reset(new RemoteMediaStreamFactory( | 635 remote_stream_factory_.reset(new RemoteMediaStreamFactory( |
634 factory_->signaling_thread(), factory_->channel_manager())); | 636 factory_->signaling_thread(), media_controller_->channel_manager())); |
635 | 637 |
636 session_.reset(new WebRtcSession( | 638 session_.reset( |
637 factory_->channel_manager(), factory_->signaling_thread(), | 639 new WebRtcSession(media_controller_.get(), factory_->signaling_thread(), |
638 factory_->worker_thread(), port_allocator_.get())); | 640 factory_->worker_thread(), port_allocator_.get())); |
639 stats_.reset(new StatsCollector(this)); | 641 stats_.reset(new StatsCollector(this)); |
640 | 642 |
641 // Initialize the WebRtcSession. It creates transport channels etc. | 643 // Initialize the WebRtcSession. It creates transport channels etc. |
642 if (!session_->Initialize(factory_->options(), constraints, | 644 if (!session_->Initialize(factory_->options(), constraints, |
643 dtls_identity_store.Pass(), configuration)) { | 645 dtls_identity_store.Pass(), configuration)) { |
644 return false; | 646 return false; |
645 } | 647 } |
646 | 648 |
647 // Register PeerConnection as receiver of local ice candidates. | 649 // Register PeerConnection as receiver of local ice candidates. |
648 // All the callbacks will be posted to the application from PeerConnection. | 650 // All the callbacks will be posted to the application from PeerConnection. |
(...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1949 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const { | 1951 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const { |
1950 for (const auto& channel : sctp_data_channels_) { | 1952 for (const auto& channel : sctp_data_channels_) { |
1951 if (channel->id() == sid) { | 1953 if (channel->id() == sid) { |
1952 return channel; | 1954 return channel; |
1953 } | 1955 } |
1954 } | 1956 } |
1955 return nullptr; | 1957 return nullptr; |
1956 } | 1958 } |
1957 | 1959 |
1958 } // namespace webrtc | 1960 } // namespace webrtc |
OLD | NEW |