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

Revert "Now calculates RTT in SendSideCongestionController."

Browse Source 
This reverts commit 8c319e951a6c59212e23af858a4c51d28b4eedc1.

Reason for revert: Increase in dropped frames and decreased send bandwidth in perf tests.

Original change's description:
> Now calculates RTT in SendSideCongestionController.
> 
> Moved calculation of round trip time from transport feedback adapter to send side congestion
> controller. This reduces the role of the transport specific transport feedback adapter and
> gives more power to the congestion controller to decide how the feedback rtt should be
> calculated and used.
> 
> Bug: webrtc:8415
> Change-Id: I7878d9fb32c3f4ed11993a6f39e6d9c69fab190a
> Reviewed-on: https://webrtc-review.googlesource.com/27980
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20973}

TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org

Change-Id: I993d00de7171a163a41b486d68b9255fd5c0f5da
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8415
Reviewed-on: https://webrtc-review.googlesource.com/28300
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20984}
This commit is contained in:
Björn Terelius
2017-12-01 19:03:43 +00:00
committed by Commit Bot
parent 2d8c3f01ac
commit 87f3a14fdb
4 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/congestion_controller/include/send_side_congestion_controller.h
View File

@ -11,7 +11,6 @@
#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_
#define MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_
#include <deque>
#include <memory>
#include <vector>
@ -137,11 +136,7 @@ class SendSideCongestionController : public CallStatsObserver,
const std::unique_ptr<ProbeController> probe_controller_;
const std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
TransportFeedbackAdapter transport_feedback_adapter_;
rtc::CriticalSection network_state_lock_;
std::deque<int64_t> feedback_rtts_ RTC_GUARDED_BY(network_state_lock_);
rtc::Optional<int64_t> min_feedback_rtt_ms_
RTC_GUARDED_BY(network_state_lock_);
uint32_t last_reported_bitrate_bps_ RTC_GUARDED_BY(network_state_lock_);
uint8_t last_reported_fraction_loss_ RTC_GUARDED_BY(network_state_lock_);
int64_t last_reported_rtt_ RTC_GUARDED_BY(network_state_lock_);