zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove BitrateController dependency fromVideoReceiveStream.

Browse Source 
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}
This commit is contained in:
mflodman
2015-11-13 11:12:07 +01:00
parent 464c0878d9
commit 0a41893e36
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/video/video_receive_stream.cc
View File

@ -18,7 +18,6 @@
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"
#include "webrtc/call/congestion_controller.h" #include "webrtc/call/congestion_controller.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.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/system_wrappers/include/clock.h"
#include "webrtc/video/receive_statistics_proxy.h" #include "webrtc/video/receive_statistics_proxy.h"
#include "webrtc/video_engine/call_stats.h" #include "webrtc/video_engine/call_stats.h"
@ -161,9 +160,7 @@ VideoReceiveStream::VideoReceiveStream(
vie_channel_.reset(new ViEChannel( vie_channel_.reset(new ViEChannel(
num_cpu_cores, &transport_adapter_, process_thread, nullptr, num_cpu_cores, &transport_adapter_, process_thread, nullptr,
congestion_controller_->GetBitrateController()-> nullptr, nullptr, bitrate_estimator, call_stats_->rtcp_rtt_stats(),
CreateRtcpBandwidthObserver(),
nullptr, bitrate_estimator, call_stats_->rtcp_rtt_stats(),
congestion_controller_->pacer(), congestion_controller_->packet_router(), congestion_controller_->pacer(), congestion_controller_->packet_router(),
1, false)); 1, false));

4
webrtc/video_engine/vie_channel.cc
View File

@ -122,8 +122,8 @@ ViEChannel::ViEChannel(uint32_t number_of_cores,
CreateRtpRtcpModules(!sender, CreateRtpRtcpModules(!sender,
vie_receiver_.GetReceiveStatistics(), vie_receiver_.GetReceiveStatistics(),
transport, transport,
sender ? intra_frame_observer_ : nullptr, intra_frame_observer_,
sender ? bandwidth_observer_.get() : nullptr, bandwidth_observer_.get(),
transport_feedback_observer_, transport_feedback_observer_,
rtt_stats_, rtt_stats_,
&rtcp_packet_type_counter_observer_, &rtcp_packet_type_counter_observer_,