Support REMB in combination with send-side BWE.

webrtc/call/congestion_controller.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 219 matching lines @@
   if (send_side_bwe)
     return remote_estimator_proxy_.get();
   else
     return remote_bitrate_estimator_.get();
 }
 
 TransportFeedbackObserver*
 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()));
     transport_feedback_adapter_->GetBitrateEstimator()->SetMinBitrate(
         min_bitrate_bps_);
     call_stats_->RegisterStatsObserver(transport_feedback_adapter_.get());
   }
   return transport_feedback_adapter_.get();
 }
 
@@ skipping 32 matching lines @@
   }
 }
 
 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) {
   if (transport_feedback_adapter_) {
     transport_feedback_adapter_->OnSentPacket(sent_packet.packet_id,
                                               sent_packet.send_time_ms);
   }
 }
 }  // namespace webrtc