commit 83d29d5988f32fbe8a8d31272831416460996607
author Jeremy Leconte <jleconte@google.com> Sat Mar 09 20:02:59 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 12 09:20:48 2024
tree b67629a848e56f3fa4a3c36c06c1984945c8bfc3
parent 793add9dfb9542f124f22b5367a84841baafad12

Remove GetScalabilityMode2.

Change-Id: Ibe3162dbcaca31c3c22df0fdc8fe55b78ad7990b
Bug: b/327381318
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/342400
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41878}

api/video_codecs/simulcast_stream.cc

diff --git a/api/video_codecs/simulcast_stream.cc b/api/video_codecs/simulcast_stream.cc
index cf377f5..a867597 100644
--- a/api/video_codecs/simulcast_stream.cc
+++ b/api/video_codecs/simulcast_stream.cc
@@ -36,16 +36,4 @@
   return scalability_modes[numberOfTemporalLayers - 1];
 }
 
-absl::optional<ScalabilityMode> SimulcastStream::GetScalabilityMode2() const {
-  static const ScalabilityMode scalability_modes[3] = {
-      ScalabilityMode::kL1T1,
-      ScalabilityMode::kL1T2,
-      ScalabilityMode::kL1T3,
-  };
-  if (numberOfTemporalLayers < 1 || numberOfTemporalLayers > 3) {
-    return absl::nullopt;
-  }
-  return scalability_modes[numberOfTemporalLayers - 1];
-}
-
 }  // namespace webrtc

api/video_codecs/simulcast_stream.h

diff --git a/api/video_codecs/simulcast_stream.h b/api/video_codecs/simulcast_stream.h
index 7bc0e1f..6521536 100644
--- a/api/video_codecs/simulcast_stream.h
+++ b/api/video_codecs/simulcast_stream.h
@@ -23,8 +23,6 @@
   // setting to ScalabilityMode.
   unsigned char GetNumberOfTemporalLayers() const;
   absl::optional<ScalabilityMode> GetScalabilityMode() const;
-  // TODO(b/327381318): Rename to GetScalabilityMode.
-  absl::optional<ScalabilityMode> GetScalabilityMode2() const;
   void SetNumberOfTemporalLayers(unsigned char n);
 
   int width = 0;