From 51f98ccb5df2418296ced14cfd1bcb0849cabfaf Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Thu, 29 Feb 2024 08:00:33 +0100
Subject: [PATCH] Prepare the removal of GetScalabilityMode2.

Change-Id: I4b41fd1faee0e27b2b05842d7825b6b0785735ec
Bug: b/327381318
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/341600
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#41870}
---
 api/video_codecs/simulcast_stream.cc      | 8 ++++----
 api/video_codecs/simulcast_stream.h       | 2 +-
 api/video_codecs/video_codec.cc           | 2 +-
 media/engine/simulcast_encoder_adapter.cc | 2 +-
 video/video_stream_encoder.cc             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/video_codecs/simulcast_stream.cc b/api/video_codecs/simulcast_stream.cc
index d4703b5e34..cf377f5651 100644
--- a/api/video_codecs/simulcast_stream.cc
+++ b/api/video_codecs/simulcast_stream.cc
@@ -24,18 +24,18 @@ void SimulcastStream::SetNumberOfTemporalLayers(unsigned char n) {
   numberOfTemporalLayers = n;
 }
 
-ScalabilityMode SimulcastStream::GetScalabilityMode() const {
-  RTC_CHECK_GE(numberOfTemporalLayers, 1);
-  RTC_CHECK_LE(numberOfTemporalLayers, 3);
+absl::optional<ScalabilityMode> SimulcastStream::GetScalabilityMode() 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];
 }
 
-// TODO(b/327381318): Rename to GetScalabilityMode.
 absl::optional<ScalabilityMode> SimulcastStream::GetScalabilityMode2() const {
   static const ScalabilityMode scalability_modes[3] = {
       ScalabilityMode::kL1T1,
diff --git a/api/video_codecs/simulcast_stream.h b/api/video_codecs/simulcast_stream.h
index 57511854b7..7bc0e1fa53 100644
--- a/api/video_codecs/simulcast_stream.h
+++ b/api/video_codecs/simulcast_stream.h
@@ -22,7 +22,7 @@ struct SimulcastStream {
   // Temporary utility methods for transition from numberOfTemporalLayers
   // setting to ScalabilityMode.
   unsigned char GetNumberOfTemporalLayers() const;
-  ScalabilityMode GetScalabilityMode() const;
+  absl::optional<ScalabilityMode> GetScalabilityMode() const;
   // TODO(b/327381318): Rename to GetScalabilityMode.
   absl::optional<ScalabilityMode> GetScalabilityMode2() const;
   void SetNumberOfTemporalLayers(unsigned char n);
diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index 9266b6d737..ff6f67f15a 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -93,7 +93,7 @@ std::string VideoCodec::ToString() const {
     for (size_t i = 0; i < numberOfSimulcastStreams; ++i) {
       const SimulcastStream stream = simulcastStream[i];
       absl::optional<ScalabilityMode> scalability_mode =
-          stream.GetScalabilityMode2();
+          stream.GetScalabilityMode();
       if (scalability_mode.has_value()) {
         ss << "[" << stream.width << "x" << stream.height << " "
            << ScalabilityModeToString(*scalability_mode)
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index 18435355aa..f595dbe9d6 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -810,7 +810,7 @@ webrtc::VideoCodec SimulcastEncoderAdapter::MakeStreamCodec(
   // SimulcastEncoderAdapter is used. This allows multiple encodings of L1Tx,
   // but SimulcastStream currently does not support multiple spatial layers.
   absl::optional<ScalabilityMode> scalability_mode =
-      stream_params.GetScalabilityMode2();
+      stream_params.GetScalabilityMode();
   // To support the full set of scalability modes in the event that this is the
   // only active encoding, prefer VideoCodec::GetScalabilityMode() if all other
   // encodings are inactive.
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 19506b18d3..35d9c435cc 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -1158,7 +1158,7 @@ void VideoStreamEncoder::ReconfigureEncoder() {
   log_stream << "ReconfigureEncoder: simulcast streams: ";
   for (size_t i = 0; i < codec.numberOfSimulcastStreams; ++i) {
     absl::optional<ScalabilityMode> scalability_mode =
-        codec.simulcastStream[i].GetScalabilityMode2();
+        codec.simulcastStream[i].GetScalabilityMode();
     if (scalability_mode) {
       log_stream << "{" << i << ": " << codec.simulcastStream[i].width << "x"
                  << codec.simulcastStream[i].height << " "