From 0a41893e36148642d8f37fc91738e42eca47fef8 Mon Sep 17 00:00:00 2001 From: mflodman Date: Fri, 13 Nov 2015 11:12:07 +0100 Subject: [PATCH] Remove BitrateController dependency fromVideoReceiveStream. I have another CL moving REMB from CongestonController to Call, then I'll remove CongestoinController from this class too. R=stefan@webrtc.org Review URL: https://codereview.webrtc.org/1442003002 . Cr-Commit-Position: refs/heads/master@{#10632} --- webrtc/video/video_receive_stream.cc | 5 +---- webrtc/video_engine/vie_channel.cc | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc index 7986b37bcf..287f5355dc 100644 --- a/webrtc/video/video_receive_stream.cc +++ b/webrtc/video/video_receive_stream.cc @@ -18,7 +18,6 @@ #include "webrtc/base/logging.h" #include "webrtc/call/congestion_controller.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/receive_statistics_proxy.h" #include "webrtc/video_engine/call_stats.h" @@ -161,9 +160,7 @@ VideoReceiveStream::VideoReceiveStream( vie_channel_.reset(new ViEChannel( num_cpu_cores, &transport_adapter_, process_thread, nullptr, - congestion_controller_->GetBitrateController()-> - CreateRtcpBandwidthObserver(), - nullptr, bitrate_estimator, call_stats_->rtcp_rtt_stats(), + nullptr, nullptr, bitrate_estimator, call_stats_->rtcp_rtt_stats(), congestion_controller_->pacer(), congestion_controller_->packet_router(), 1, false)); diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index fa8a35069f..90f79b1112 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -122,8 +122,8 @@ ViEChannel::ViEChannel(uint32_t number_of_cores, CreateRtpRtcpModules(!sender, vie_receiver_.GetReceiveStatistics(), transport, - sender ? intra_frame_observer_ : nullptr, - sender ? bandwidth_observer_.get() : nullptr, + intra_frame_observer_, + bandwidth_observer_.get(), transport_feedback_observer_, rtt_stats_, &rtcp_packet_type_counter_observer_,