From b02a8f5a7cb432782fa23afc1cdad3bb1ee5a165 Mon Sep 17 00:00:00 2001 From: philipel Date: Mon, 12 Dec 2022 17:17:34 +0100 Subject: [PATCH] Remove expired MidCallProbing metrics. Bug: chromium:1039328 Change-Id: I60c931f5996579c140b00c09772912bbd2842b8d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/287682 Commit-Queue: Philip Eliasson Reviewed-by: Per Kjellander Cr-Commit-Position: refs/heads/main@{#38879} --- .../goog_cc/probe_controller.cc | 22 ------------------- .../goog_cc/probe_controller.h | 4 ---- 2 files changed, 26 deletions(-) diff --git a/modules/congestion_controller/goog_cc/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc index fcbcbc13b4..1af943c4cb 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.cc +++ b/modules/congestion_controller/goog_cc/probe_controller.cc @@ -200,17 +200,6 @@ std::vector ProbeController::SetBitrates( // estimate then initiate probing. if (!estimated_bitrate_.IsZero() && old_max_bitrate < max_bitrate_ && estimated_bitrate_ < max_bitrate_) { - // The assumption is that if we jump more than 20% in the bandwidth - // estimate or if the bandwidth estimate is within 90% of the new - // max bitrate then the probing attempt was successful. - mid_call_probing_succcess_threshold_ = - std::min(estimated_bitrate_ * 1.2, max_bitrate_ * 0.9); - mid_call_probing_waiting_for_result_ = true; - mid_call_probing_bitrate_ = max_bitrate_; - - RTC_HISTOGRAM_COUNTS_10000("WebRTC.BWE.MidCallProbing.Initiated", - max_bitrate_.kbps()); - return InitiateProbing(at_time, {max_bitrate_}, false); } break; @@ -298,14 +287,6 @@ std::vector ProbeController::SetEstimatedBitrate( } estimated_bitrate_ = bitrate; - if (mid_call_probing_waiting_for_result_ && - bitrate >= mid_call_probing_succcess_threshold_) { - RTC_HISTOGRAM_COUNTS_10000("WebRTC.BWE.MidCallProbing.Success", - mid_call_probing_bitrate_.kbps()); - RTC_HISTOGRAM_COUNTS_10000("WebRTC.BWE.MidCallProbing.ProbedKbps", - bitrate.kbps()); - mid_call_probing_waiting_for_result_ = false; - } if (state_ == State::kWaitingForProbingResult) { // Continue probing if probing results indicate channel has greater // capacity. @@ -399,7 +380,6 @@ void ProbeController::Reset(Timestamp at_time) { Timestamp now = at_time; last_bwe_drop_probing_time_ = now; alr_end_time_.reset(); - mid_call_probing_waiting_for_result_ = false; time_of_last_large_drop_ = now; bitrate_before_last_large_drop_ = DataRate::Zero(); max_total_allocated_bitrate_ = DataRate::Zero(); @@ -450,8 +430,6 @@ bool ProbeController::TimeForNetworkStateProbe(Timestamp at_time) const { std::vector ProbeController::Process(Timestamp at_time) { if (at_time - time_last_probing_initiated_ > kMaxWaitingTimeForProbingResult) { - mid_call_probing_waiting_for_result_ = false; - if (state_ == State::kWaitingForProbingResult) { RTC_LOG(LS_INFO) << "kWaitingForProbingResult: timeout"; state_ = State::kProbingComplete; diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h index 2d22f84d08..aa8b526ab0 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.h +++ b/modules/congestion_controller/goog_cc/probe_controller.h @@ -184,10 +184,6 @@ class ProbeController { DataRate max_total_allocated_bitrate_ = DataRate::Zero(); const bool in_rapid_recovery_experiment_; - // For WebRTC.BWE.MidCallProbing.* metric. - bool mid_call_probing_waiting_for_result_; - DataRate mid_call_probing_bitrate_ = DataRate::Zero(); - DataRate mid_call_probing_succcess_threshold_ = DataRate::Zero(); RtcEventLog* event_log_; int32_t next_probe_cluster_id_ = 1;