mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused field trial DisablePacerEmergencyStop

Browse source 
This field trial was added 5 years ago in
https://webrtc-review.googlesource.com/c/src/+/111883
probably as a safe guard, but looks never used.

Bug: webrtc:11503
Change-Id: Ia9544b652b25fad4c614d66fe020f3d994c96505
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333380
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41490}
This commit is contained in:
Danil Chapovalov 2024-01-09 11:48:13 +01:00 committed by WebRTC LUCI CQ
parent b7ec05777a
commit dda037db07
4 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
experiments/field_trials.py
View file

@ -568,9 +568,6 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
FieldTrial('WebRTC-DependencyDescriptorAdvertised', FieldTrial('WebRTC-DependencyDescriptorAdvertised',
'webrtc:10342', 'webrtc:10342',
date(2024, 4, 1)), date(2024, 4, 1)),
FieldTrial('WebRTC-DisablePacerEmergencyStop',
'',
date(2024, 4, 1)),
FieldTrial('WebRTC-DisableUlpFecExperiment', FieldTrial('WebRTC-DisableUlpFecExperiment',
'', '',
date(2024, 4, 1)), date(2024, 4, 1)),

1
modules/congestion_controller/rtp/BUILD.gn
View file

@ -34,7 +34,6 @@ rtc_library("control_handler") {
"../../../rtc_base:safe_conversions", "../../../rtc_base:safe_conversions",
"../../../rtc_base:safe_minmax", "../../../rtc_base:safe_minmax",
"../../../rtc_base/system:no_unique_address", "../../../rtc_base/system:no_unique_address",
"../../../system_wrappers:field_trial",
"../../pacing", "../../pacing",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]

16
modules/congestion_controller/rtp/control_handler.cc
View file

@ -18,21 +18,8 @@
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/numerics/safe_minmax.h"
#include "system_wrappers/include/field_trial.h"
namespace webrtc { namespace webrtc {
namespace {
// By default, pacer emergency stops encoder when buffer reaches a high level.
bool IsPacerEmergencyStopDisabled() {
return field_trial::IsEnabled("WebRTC-DisablePacerEmergencyStop");
}
} // namespace
CongestionControlHandler::CongestionControlHandler()
: disable_pacer_emergency_stop_(IsPacerEmergencyStopDisabled()) {}
CongestionControlHandler::~CongestionControlHandler() {}
void CongestionControlHandler::SetTargetRate( void CongestionControlHandler::SetTargetRate(
TargetTransferRate new_target_rate) { TargetTransferRate new_target_rate) {
@ -60,8 +47,7 @@ absl::optional<TargetTransferRate> CongestionControlHandler::GetUpdate() {
bool pause_encoding = false; bool pause_encoding = false;
if (!network_available_) { if (!network_available_) {
pause_encoding = true; pause_encoding = true;
} else if (!disable_pacer_emergency_stop_ && } else if (pacer_expected_queue_ms_ >
pacer_expected_queue_ms_ >
PacingController::kMaxExpectedQueueLength.ms()) { PacingController::kMaxExpectedQueueLength.ms()) {
pause_encoding = true; pause_encoding = true;
} }

6
modules/congestion_controller/rtp/control_handler.h
View file

@ -28,12 +28,13 @@ namespace webrtc {
// destruction unless members are properly ordered. // destruction unless members are properly ordered.
class CongestionControlHandler { class CongestionControlHandler {
public: public:
CongestionControlHandler(); CongestionControlHandler() = default;
~CongestionControlHandler();
CongestionControlHandler(const CongestionControlHandler&) = delete; CongestionControlHandler(const CongestionControlHandler&) = delete;
CongestionControlHandler& operator=(const CongestionControlHandler&) = delete; CongestionControlHandler& operator=(const CongestionControlHandler&) = delete;
~CongestionControlHandler() = default;
void SetTargetRate(TargetTransferRate new_target_rate); void SetTargetRate(TargetTransferRate new_target_rate);
void SetNetworkAvailability(bool network_available); void SetNetworkAvailability(bool network_available);
void SetPacerQueue(TimeDelta expected_queue_time); void SetPacerQueue(TimeDelta expected_queue_time);
@ -45,7 +46,6 @@ class CongestionControlHandler {
bool network_available_ = true; bool network_available_ = true;
bool encoder_paused_in_last_report_ = false; bool encoder_paused_in_last_report_ = false;
const bool disable_pacer_emergency_stop_;
int64_t pacer_expected_queue_ms_ = 0; int64_t pacer_expected_queue_ms_ = 0;
RTC_NO_UNIQUE_ADDRESS SequenceChecker sequenced_checker_; RTC_NO_UNIQUE_ADDRESS SequenceChecker sequenced_checker_;