From b071871aa06a8db400b000400f0fb8bf7c247904 Mon Sep 17 00:00:00 2001
From: philipel <philipel@webrtc.org>
Date: Fri, 18 Aug 2023 15:22:25 +0200
Subject: [PATCH] Remove unused ALR experiment settings from
 VideoStreamEncoder.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: none
Change-Id: Ie468de940656be7dd307cc529be6c3904c275144
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/316920
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40571}
---
 video/BUILD.gn                |  1 -
 video/video_stream_encoder.cc | 22 ----------------------
 video/video_stream_encoder.h  |  5 -----
 3 files changed, 28 deletions(-)

diff --git a/video/BUILD.gn b/video/BUILD.gn
index 54291e46bb..e0ef6fab8f 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -418,7 +418,6 @@ rtc_library("video_stream_encoder_impl") {
     "../rtc_base:safe_conversions",
     "../rtc_base:stringutils",
     "../rtc_base:timeutils",
-    "../rtc_base/experiments:alr_experiment",
     "../rtc_base/experiments:balanced_degradation_settings",
     "../rtc_base/experiments:encoder_info_settings",
     "../rtc_base/experiments:field_trial_parser",
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 1fd82bb012..693413775e 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -43,7 +43,6 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/event.h"
-#include "rtc_base/experiments/alr_experiment.h"
 #include "rtc_base/experiments/encoder_info_settings.h"
 #include "rtc_base/experiments/rate_control_settings.h"
 #include "rtc_base/logging.h"
@@ -188,26 +187,6 @@ bool RequiresEncoderReset(const VideoCodec& prev_send_codec,
   return false;
 }
 
-std::array<uint8_t, 2> GetExperimentGroups() {
-  std::array<uint8_t, 2> experiment_groups;
-  absl::optional<AlrExperimentSettings> experiment_settings =
-      AlrExperimentSettings::CreateFromFieldTrial(
-          AlrExperimentSettings::kStrictPacingAndProbingExperimentName);
-  if (experiment_settings) {
-    experiment_groups[0] = experiment_settings->group_id + 1;
-  } else {
-    experiment_groups[0] = 0;
-  }
-  experiment_settings = AlrExperimentSettings::CreateFromFieldTrial(
-      AlrExperimentSettings::kScreenshareProbingBweExperimentName);
-  if (experiment_settings) {
-    experiment_groups[1] = experiment_settings->group_id + 1;
-  } else {
-    experiment_groups[1] = 0;
-  }
-  return experiment_groups;
-}
-
 // Limit allocation across TLs in bitrate allocation according to number of TLs
 // in EncoderInfo.
 VideoBitrateAllocation UpdateAllocationFromEncoderInfo(
@@ -711,7 +690,6 @@ VideoStreamEncoder::VideoStreamEncoder(
       cwnd_frame_counter_(0),
       next_frame_types_(1, VideoFrameType::kVideoFrameDelta),
       frame_encode_metadata_writer_(this),
-      experiment_groups_(GetExperimentGroups()),
       automatic_animation_detection_experiment_(
           ParseAutomatincAnimationDetectionFieldTrial()),
       input_state_provider_(encoder_stats_observer),
diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h
index 7724026b5f..68f008afc0 100644
--- a/video/video_stream_encoder.h
+++ b/video/video_stream_encoder.h
@@ -394,11 +394,6 @@ class VideoStreamEncoder : public VideoStreamEncoderInterface,
 
   FrameEncodeMetadataWriter frame_encode_metadata_writer_;
 
-  // Experiment groups parsed from field trials for realtime video ([0]) and
-  // screenshare ([1]). 0 means no group specified. Positive values are
-  // experiment group numbers incremented by 1.
-  const std::array<uint8_t, 2> experiment_groups_;
-
   struct AutomaticAnimationDetectionExperiment {
     bool enabled = false;
     int min_duration_ms = 2000;