admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let Call register ReceiveSideCongestionController as CallStatsObserver.

Browse Source 
Fixes a regression from cl https://codereview.webrtc.org/2752233002.

BUG=chromium:704491,webrtc:6847

Review-Url: https://codereview.webrtc.org/2777423002
Cr-Commit-Position: refs/heads/master@{#17407}
This commit is contained in:
nisse 2017-03-28 01:16:25 -07:00 committed by Commit bot
parent fae2d2bdb3
commit bcbaf74643
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/call/call.cc
View File

@ -392,6 +392,7 @@ Call::Call(const Call::Config& config,
config_.bitrate_config.min_bitrate_bps,
config_.bitrate_config.start_bitrate_bps,
config_.bitrate_config.max_bitrate_bps);
call_stats_->RegisterStatsObserver(&receive_side_cc_);
call_stats_->RegisterStatsObserver(transport_send_->send_side_cc());
module_process_thread_->Start();
@ -426,6 +427,7 @@ Call::~Call() {
module_process_thread_->DeRegisterModule(&receive_side_cc_);
module_process_thread_->DeRegisterModule(call_stats_.get());
module_process_thread_->Stop();
call_stats_->DeregisterStatsObserver(&receive_side_cc_);
call_stats_->DeregisterStatsObserver(transport_send_->send_side_cc());
// Only update histograms after process threads have been shut down, so that

1
webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h
View File

@ -46,7 +46,6 @@ class ReceiveSideCongestionController : public CallStatsObserver,
virtual const RemoteBitrateEstimator* GetRemoteBitrateEstimator(
bool send_side_bwe) const;
// TODO(nisse): Called by CongestionController, but not otherwise wired up.
// Implements CallStatsObserver.
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;