Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(831)

Unified Diff: webrtc/pc/channelmanager.cc

Issue 2648233003: Adding ability for BaseChannel to use PacketTransportInterface. (Closed)
Patch Set: Fix TSAN warning in test by starting thread after setting fake clock Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channelmanager.cc
diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
index f667900d3e2834c6fbf75455c768bda848d25dce..965719193eb858b61e3ce137705a7a88e928d90c 100644
--- a/webrtc/pc/channelmanager.cc
+++ b/webrtc/pc/channelmanager.cc
@@ -246,7 +246,8 @@ VoiceChannel* ChannelManager::CreateVoiceChannel_w(
media_channel, content_name, rtcp_mux_required, srtp_required);
voice_channel->SetCryptoOptions(crypto_options_);
- if (!voice_channel->Init_w(rtp_transport, rtcp_transport)) {
+ if (!voice_channel->Init_w(rtp_transport, rtcp_transport, rtp_transport,
+ rtcp_transport)) {
delete voice_channel;
return nullptr;
}
@@ -317,7 +318,8 @@ VideoChannel* ChannelManager::CreateVideoChannel_w(
worker_thread_, network_thread_, signaling_thread, media_channel,
content_name, rtcp_mux_required, srtp_required);
video_channel->SetCryptoOptions(crypto_options_);
- if (!video_channel->Init_w(rtp_transport, rtcp_transport)) {
+ if (!video_channel->Init_w(rtp_transport, rtcp_transport, rtp_transport,
+ rtcp_transport)) {
delete video_channel;
return NULL;
}
@@ -390,7 +392,8 @@ RtpDataChannel* ChannelManager::CreateRtpDataChannel_w(
worker_thread_, network_thread_, signaling_thread, media_channel,
content_name, rtcp_mux_required, srtp_required);
data_channel->SetCryptoOptions(crypto_options_);
- if (!data_channel->Init_w(rtp_transport, rtcp_transport)) {
+ if (!data_channel->Init_w(rtp_transport, rtcp_transport, rtp_transport,
+ rtcp_transport)) {
LOG(LS_WARNING) << "Failed to init data channel.";
delete data_channel;
return nullptr;
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698