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

Unified Diff: webrtc/pc/peerconnection.cc

Issue 2880323002: Move ownership of RtpTransportControllerSendInterface from Call to PeerConnection.
Patch Set: Delete shadowing member variables in BitrateEstimatorTest. Created 3 years, 7 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/peerconnection.h ('k') | webrtc/test/call_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnection.cc
diff --git a/webrtc/pc/peerconnection.cc b/webrtc/pc/peerconnection.cc
index 852dd39de5bc21eed1461340f796d4ef0132e55f..ab69ce1cde87a09d9152718a26dfcc108bfe642c 100644
--- a/webrtc/pc/peerconnection.cc
+++ b/webrtc/pc/peerconnection.cc
@@ -22,10 +22,12 @@
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
+#include "webrtc/base/ptr_util.h"
#include "webrtc/base/stringencode.h"
#include "webrtc/base/stringutils.h"
#include "webrtc/base/trace_event.h"
#include "webrtc/call/call.h"
+#include "webrtc/call/rtp_transport_controller_send.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/sctp/sctptransport.h"
#include "webrtc/pc/audiotrack.h"
@@ -460,6 +462,9 @@ bool PeerConnection::Initialize(
return false;
}
+ rtp_transport_controller_send_ = rtc::MakeUnique<RtpTransportControllerSend>(
+ Clock::GetRealTimeClock(), event_log_.get());
+
// Call must be constructed on the worker thread.
factory_->worker_thread()->Invoke<void>(
RTC_FROM_HERE, rtc::Bind(&PeerConnection::CreateCall_w,
@@ -2341,7 +2346,11 @@ void PeerConnection::CreateCall_w() {
call_config.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
call_config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;
- call_.reset(webrtc::Call::Create(call_config));
+ call_config.send_side_cc = rtp_transport_controller_send_->send_side_cc();
+ call_config.audio_rtp_transport_send = rtp_transport_controller_send_.get();
+ call_config.video_rtp_transport_send = rtp_transport_controller_send_.get();
+
+ call_ = rtc::WrapUnique(webrtc::Call::Create(call_config));
}
} // namespace webrtc
« no previous file with comments | « webrtc/pc/peerconnection.h ('k') | webrtc/test/call_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698