svc: Remove references to bogus modes

Those never existed, were likely a copy-paste error in the spec
that we somehow inherited.

Bug: webrtc:11607
Change-Id: Ib4a038f061123e879f1099656273f6392f092213
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/273485
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Auto-Submit: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37953}

api/video_codecs/scalability_mode.cc

@@ -20,12 +20,8 @@ absl::string_view ScalabilityModeToString(ScalabilityMode scalability_mode) {
       return "L1T1";
     case ScalabilityMode::kL1T2:
       return "L1T2";
-    case ScalabilityMode::kL1T2h:
-      return "L1T2h";
     case ScalabilityMode::kL1T3:
       return "L1T3";
-    case ScalabilityMode::kL1T3h:
-      return "L1T3h";
     case ScalabilityMode::kL2T1:
       return "L2T1";
     case ScalabilityMode::kL2T1h:

api/video_codecs/scalability_mode.h

@@ -27,9 +27,7 @@ namespace webrtc {
 enum class ScalabilityMode : uint8_t {
   kL1T1,
   kL1T2,
-  kL1T2h,
   kL1T3,
-  kL1T3h,
   kL2T1,
   kL2T1h,
   kL2T1_KEY,
@@ -61,9 +59,7 @@ inline constexpr ScalabilityMode kAllScalabilityModes[] = {
     // clang-format off
     ScalabilityMode::kL1T1,
     ScalabilityMode::kL1T2,
-    ScalabilityMode::kL1T2h,
     ScalabilityMode::kL1T3,
-    ScalabilityMode::kL1T3h,
     ScalabilityMode::kL2T1,
     ScalabilityMode::kL2T1h,
     ScalabilityMode::kL2T1_KEY,

modules/video_coding/svc/scalability_mode_util.cc

@@ -23,12 +23,8 @@ absl::optional<ScalabilityMode> ScalabilityModeFromString(
     return ScalabilityMode::kL1T1;
   if (mode_string == "L1T2")
     return ScalabilityMode::kL1T2;
-  if (mode_string == "L1T2h")
-    return ScalabilityMode::kL1T2h;
   if (mode_string == "L1T3")
     return ScalabilityMode::kL1T3;
-  if (mode_string == "L1T3h")
-    return ScalabilityMode::kL1T3h;
 
   if (mode_string == "L2T1")
     return ScalabilityMode::kL2T1;
@@ -94,9 +90,7 @@ InterLayerPredMode ScalabilityModeToInterLayerPredMode(
   switch (scalability_mode) {
     case ScalabilityMode::kL1T1:
     case ScalabilityMode::kL1T2:
-    case ScalabilityMode::kL1T2h:
     case ScalabilityMode::kL1T3:
-    case ScalabilityMode::kL1T3h:
     case ScalabilityMode::kL2T1:
     case ScalabilityMode::kL2T1h:
       return InterLayerPredMode::kOn;
@@ -143,9 +137,7 @@ int ScalabilityModeToNumSpatialLayers(ScalabilityMode scalability_mode) {
   switch (scalability_mode) {
     case ScalabilityMode::kL1T1:
     case ScalabilityMode::kL1T2:
-    case ScalabilityMode::kL1T2h:
     case ScalabilityMode::kL1T3:
-    case ScalabilityMode::kL1T3h:
       return 1;
     case ScalabilityMode::kL2T1:
     case ScalabilityMode::kL2T1h:
@@ -185,10 +177,8 @@ int ScalabilityModeToNumTemporalLayers(ScalabilityMode scalability_mode) {
     case ScalabilityMode::kL1T1:
       return 1;
     case ScalabilityMode::kL1T2:
-    case ScalabilityMode::kL1T2h:
       return 2;
     case ScalabilityMode::kL1T3:
-    case ScalabilityMode::kL1T3h:
       return 3;
     case ScalabilityMode::kL2T1:
     case ScalabilityMode::kL2T1h:
@@ -233,9 +223,7 @@ absl::optional<ScalabilityModeResolutionRatio> ScalabilityModeToResolutionRatio(
   switch (scalability_mode) {
     case ScalabilityMode::kL1T1:
     case ScalabilityMode::kL1T2:
-    case ScalabilityMode::kL1T2h:
     case ScalabilityMode::kL1T3:
-    case ScalabilityMode::kL1T3h:
       return absl::nullopt;
     case ScalabilityMode::kL2T1:
     case ScalabilityMode::kL2T1_KEY:

pc/test/svc_e2e_tests.cc

@@ -319,9 +319,7 @@ INSTANTIATE_TEST_SUITE_P(
         ValuesIn({
             SvcTestParameters{kVp9CodecName, "L1T1", 1, 1},
             SvcTestParameters{kVp9CodecName, "L1T2", 1, 2},
-            // SvcTestParameters{kVp9CodecName, "L1T2h", 1, 2},
             SvcTestParameters{kVp9CodecName, "L1T3", 1, 3},
-            // SvcTestParameters{kVp9CodecName, "L1T3h", 1, 3},
             SvcTestParameters{kVp9CodecName, "L2T1", 2, 1},
             SvcTestParameters{kVp9CodecName, "L2T1h", 2, 1},
             SvcTestParameters{kVp9CodecName, "L2T1_KEY", 2, 1},
@@ -367,9 +365,7 @@ INSTANTIATE_TEST_SUITE_P(
     Combine(ValuesIn({
                 SvcTestParameters{kAv1CodecName, "L1T1", 1, 1},
                 SvcTestParameters{kAv1CodecName, "L1T2", 1, 2},
-                // SvcTestParameters{kAv1CodecName, "L1T2h", 1, 2},
                 SvcTestParameters{kAv1CodecName, "L1T3", 1, 3},
-                // SvcTestParameters{kAv1CodecName, "L1T3h", 1, 3},
                 SvcTestParameters{kAv1CodecName, "L2T1", 2, 1},
                 SvcTestParameters{kAv1CodecName, "L2T1h", 2, 1},
                 SvcTestParameters{kAv1CodecName, "L2T1_KEY", 2, 1},