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

Remove trial WebRTC-Bwe-ProbeRateFallback

Browse Source 
It was intended to be used for to fall back to probe rate if ack rate is missing.

This partly reverts commit aa4f100225e86723e75497aaf2d510588dcb9851.

Reason for revert:
Code is unused 1 year after submitted.

Original change's description:
> Adds trial to fall back to probe rate if ack rate is missing.
>
> Bug: webrtc:9718
> Change-Id: I7b6e1d3c051e67b97f6de1ec95e84631af9c5b0d
> Reviewed-on: https://webrtc-review.googlesource.com/c/113600
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25953}

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:9718
Change-Id: I06804782c2e210d1c484426e915e4d8447572739
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158084
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29597}
This commit is contained in:
Per Kjellander 2019-10-24 09:44:12 +02:00 committed by Commit Bot
parent d113ee326b
commit eec39190ce
5 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/congestion_controller/goog_cc/goog_cc_network_control.cc
View File

@ -70,8 +70,6 @@ GoogCcNetworkController::GoogCcNetworkController(NetworkControllerConfig config,
use_downlink_delay_for_congestion_window_(
IsEnabled(key_value_config_,
"WebRTC-Bwe-CongestionWindowDownlinkDelay")),
fall_back_to_probe_rate_(
IsEnabled(key_value_config_, "WebRTC-Bwe-ProbeRateFallback")),
use_min_allocatable_as_lower_bound_(
IsNotDisabled(key_value_config_, "WebRTC-Bwe-MinAllocAsLowerBound")),
rate_control_settings_(
@ -481,6 +479,9 @@ NetworkControlUpdate GoogCcNetworkController::OnTransportPacketsFeedback(
acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector(
report.SortedByReceiveTime());
auto acknowledged_bitrate = acknowledged_bitrate_estimator_->bitrate();
bandwidth_estimation_->SetAcknowledgedRate(acknowledged_bitrate,
report.feedback_time);
bandwidth_estimation_->IncomingPacketFeedbackVector(report);
for (const auto& feedback : report.SortedByReceiveTime()) {
if (feedback.sent_packet.pacing_info.probe_cluster_id !=
PacedPacketInfo::kNotAProbe) {
@ -490,12 +491,6 @@ NetworkControlUpdate GoogCcNetworkController::OnTransportPacketsFeedback(
absl::optional<DataRate> probe_bitrate =
probe_bitrate_estimator_->FetchAndResetLastEstimatedBitrate();
if (fall_back_to_probe_rate_ && !acknowledged_bitrate)
acknowledged_bitrate = probe_bitrate_estimator_->last_estimate();
bandwidth_estimation_->SetAcknowledgedRate(acknowledged_bitrate,
report.feedback_time);
bandwidth_estimation_->IncomingPacketFeedbackVector(report);
if (network_estimator_) {
network_estimator_->OnTransportPacketsFeedback(report);
auto prev_estimate = estimate_;

1
modules/congestion_controller/goog_cc/goog_cc_network_control.h
View File

@ -86,7 +86,6 @@ class GoogCcNetworkController : public NetworkControllerInterface {
FieldTrialFlag safe_reset_on_route_change_;
FieldTrialFlag safe_reset_acknowledged_rate_;
const bool use_downlink_delay_for_congestion_window_;
const bool fall_back_to_probe_rate_;
const bool use_min_allocatable_as_lower_bound_;
const RateControlSettings rate_control_settings_;

1
modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc
View File

@ -698,7 +698,6 @@ TEST_F(GoogCcNetworkControllerTest, CutsHighRateInSafeResetTrial) {
TEST_F(GoogCcNetworkControllerTest, DetectsHighRateInSafeResetTrial) {
ScopedFieldTrials trial(
"WebRTC-Bwe-SafeResetOnRouteChange/Enabled,ack/"
"WebRTC-Bwe-ProbeRateFallback/Enabled/"
"WebRTC-SendSideBwe-WithOverhead/Enabled/");
const DataRate kInitialLinkCapacity = DataRate::kbps(200);
const DataRate kNewLinkCapacity = DataRate::kbps(800);

7
modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
View File

@ -171,9 +171,8 @@ absl::optional<DataRate> ProbeBitrateEstimator::HandleProbeAndEstimateBitrate(
event_log_->Log(
std::make_unique<RtcEventProbeResultSuccess>(cluster_id, res.bps()));
}
last_estimate_ = res;
estimated_data_rate_ = res;
return res;
return *estimated_data_rate_;
}
absl::optional<DataRate>
@ -183,10 +182,6 @@ ProbeBitrateEstimator::FetchAndResetLastEstimatedBitrate() {
return estimated_data_rate;
}
absl::optional<DataRate> ProbeBitrateEstimator::last_estimate() const {
return last_estimate_;
}
void ProbeBitrateEstimator::EraseOldClusters(Timestamp timestamp) {
for (auto it = clusters_.begin(); it != clusters_.end();) {
if (it->second.last_receive + kMaxClusterHistory < timestamp) {

3
modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
View File

@ -33,8 +33,6 @@ class ProbeBitrateEstimator {
absl::optional<DataRate> FetchAndResetLastEstimatedBitrate();
absl::optional<DataRate> last_estimate() const;
private:
struct AggregatedCluster {
int num_probes = 0;
@ -53,7 +51,6 @@ class ProbeBitrateEstimator {
std::map<int, AggregatedCluster> clusters_;
RtcEventLog* const event_log_;
absl::optional<DataRate> estimated_data_rate_;
absl::optional<DataRate> last_estimate_;
};
} // namespace webrtc