Index: webrtc/pc/webrtcsession.cc |
diff --git a/webrtc/pc/webrtcsession.cc b/webrtc/pc/webrtcsession.cc |
index c6046e905fd48e3a57b98315d49bebe091b56dfd..cc424b222e081c994b6a7e546f59c126d86a7c01 100644 |
--- a/webrtc/pc/webrtcsession.cc |
+++ b/webrtc/pc/webrtcsession.cc |
@@ -461,7 +461,10 @@ bool CheckForRemoteIceRestart(const SessionDescriptionInterface* old_desc, |
} |
WebRtcSession::WebRtcSession( |
- webrtc::MediaControllerInterface* media_controller, |
+ Call* call, |
+ cricket::ChannelManager* channel_manager, |
+ const cricket::MediaConfig& media_config, |
+ RtcEventLog* event_log, |
rtc::Thread* network_thread, |
rtc::Thread* worker_thread, |
rtc::Thread* signaling_thread, |
@@ -477,8 +480,10 @@ WebRtcSession::WebRtcSession( |
sid_(rtc::ToString(rtc::CreateRandomId64() & LLONG_MAX)), |
transport_controller_(std::move(transport_controller)), |
sctp_factory_(std::move(sctp_factory)), |
- media_controller_(media_controller), |
- channel_manager_(media_controller_->channel_manager()), |
+ media_config_(media_config), |
+ event_log_(event_log), |
+ call_(call), |
+ channel_manager_(channel_manager), |
ice_observer_(NULL), |
ice_connection_state_(PeerConnectionInterface::kIceConnectionNew), |
ice_connection_receiving_(true), |
@@ -630,7 +635,6 @@ void WebRtcSession::Close() { |
RTC_DCHECK(!video_channel_); |
RTC_DCHECK(!rtp_data_channel_); |
RTC_DCHECK(!sctp_transport_); |
- media_controller_->Close(); |
} |
cricket::BaseChannel* WebRtcSession::GetChannel( |
@@ -1757,7 +1761,7 @@ bool WebRtcSession::CreateVoiceChannel(const cricket::ContentInfo* content, |
} |
voice_channel_.reset(channel_manager_->CreateVoiceChannel( |
- media_controller_, rtp_dtls_transport, rtcp_dtls_transport, |
+ call_, media_config_, rtp_dtls_transport, rtcp_dtls_transport, |
transport_controller_->signaling_thread(), content->name, SrtpRequired(), |
audio_options_)); |
if (!voice_channel_) { |
@@ -1799,7 +1803,7 @@ bool WebRtcSession::CreateVideoChannel(const cricket::ContentInfo* content, |
} |
video_channel_.reset(channel_manager_->CreateVideoChannel( |
- media_controller_, rtp_dtls_transport, rtcp_dtls_transport, |
+ call_, media_config_, rtp_dtls_transport, rtcp_dtls_transport, |
transport_controller_->signaling_thread(), content->name, SrtpRequired(), |
video_options_)); |
@@ -1864,7 +1868,7 @@ bool WebRtcSession::CreateDataChannel(const cricket::ContentInfo* content, |
} |
rtp_data_channel_.reset(channel_manager_->CreateRtpDataChannel( |
- media_controller_, rtp_dtls_transport, rtcp_dtls_transport, |
+ media_config_, rtp_dtls_transport, rtcp_dtls_transport, |
transport_controller_->signaling_thread(), content->name, |
SrtpRequired())); |
@@ -2313,7 +2317,7 @@ void WebRtcSession::ReportNegotiatedCiphers( |
void WebRtcSession::OnSentPacket_w(const rtc::SentPacket& sent_packet) { |
RTC_DCHECK(worker_thread()->IsCurrent()); |
- media_controller_->call_w()->OnSentPacket(sent_packet); |
+ call_->OnSentPacket(sent_packet); |
} |
const std::string WebRtcSession::GetTransportName( |