commit 32f81542c20f86fb855bf37ba030e523d1016939
author stefan <stefan@webrtc.org> Wed Jan 20 07:13:58 2016 -0800
committer Commit bot <commit-bot@chromium.org> Wed Jan 20 15:14:03 2016 +0000
tree 327b41318c9f72c9cbf19daacd80ac165c70f922
parent a5dec16b42b1f9c36c10ebd10e5609e6752c67a0

Support REMB in combination with send-side BWE.

BUG=webrtc:4173

Review URL: https://codereview.webrtc.org/1581113006

Cr-Commit-Position: refs/heads/master@{#11322}

webrtc/call/congestion_controller.cc

diff --git a/webrtc/call/congestion_controller.cc b/webrtc/call/congestion_controller.cc
index 4030f8e..0267d79 100644
--- a/webrtc/call/congestion_controller.cc
+++ b/webrtc/call/congestion_controller.cc
@@ -237,8 +237,7 @@
 CongestionController::GetTransportFeedbackObserver() {
   if (transport_feedback_adapter_.get() == nullptr) {
     transport_feedback_adapter_.reset(new TransportFeedbackAdapter(
-        bitrate_controller_->CreateRtcpBandwidthObserver(),
-        Clock::GetRealTimeClock(), process_thread_));
+        bitrate_controller_.get(), Clock::GetRealTimeClock(), process_thread_));
     transport_feedback_adapter_->SetBitrateEstimator(
         new RemoteBitrateEstimatorAbsSendTime(
             transport_feedback_adapter_.get(), Clock::GetRealTimeClock()));