1 files changed, 22 insertions, 20 deletions
diff --git a/third_party/libwebrtc/pc/test/svc_e2e_tests.cc b/third_party/libwebrtc/pc/test/svc_e2e_tests.cc
index ae35c7f676..3fde5a44e0 100644
--- a/third_party/libwebrtc/pc/test/svc_e2e_tests.cc
+++ b/third_party/libwebrtc/pc/test/svc_e2e_tests.cc
@@ -160,10 +160,9 @@ std::string SvcTestNameGenerator(
 // encoder and decoder level.
 class SvcVideoQualityAnalyzer : public DefaultVideoQualityAnalyzer {
  public:
-  using SpatialTemporalLayerCounts =
-      webrtc::flat_map<int, webrtc::flat_map<int, int>>;
+  using SpatialTemporalLayerCounts = flat_map<int, flat_map<int, int>>;
 
-  explicit SvcVideoQualityAnalyzer(webrtc::Clock* clock)
+  explicit SvcVideoQualityAnalyzer(Clock* clock)
       : DefaultVideoQualityAnalyzer(clock,
                                     test::GetGlobalMetricsLogger(),
                                     DefaultVideoQualityAnalyzerOptions{
@@ -315,9 +314,9 @@ TEST_P(SvcTest, ScalabilityModeSupported) {
   if (UseDependencyDescriptor()) {
     trials += "WebRTC-DependencyDescriptorAdvertised/Enabled/";
   }
-  webrtc::test::ScopedFieldTrials override_trials(AppendFieldTrials(trials));
+  test::ScopedFieldTrials override_trials(AppendFieldTrials(trials));
   std::unique_ptr<NetworkEmulationManager> network_emulation_manager =
-      CreateNetworkEmulationManager(webrtc::TimeMode::kSimulated);
+      CreateNetworkEmulationManager(TimeMode::kSimulated);
   auto analyzer = std::make_unique<SvcVideoQualityAnalyzer>(
       network_emulation_manager->time_controller()->GetClock());
   SvcVideoQualityAnalyzer* analyzer_ptr = analyzer.get();
@@ -475,16 +474,17 @@ INSTANTIATE_TEST_SUITE_P(
                 SvcTestParameters::Create(kAv1CodecName, "L2T3h"),
                 SvcTestParameters::Create(kAv1CodecName, "L2T3_KEY"),
                 // SvcTestParameters::Create(kAv1CodecName, "L2T3_KEY_SHIFT"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T1"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T1h"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T1_KEY"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T2"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T2h"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T2_KEY"),
+                // TODO(bugs.webrtc.org/15666): Investigate and reenable AV1
+                // L3 tests. SvcTestParameters::Create(kAv1CodecName, "L3T1"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T1h"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T1_KEY"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T2"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T2h"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T2_KEY"),
                 // SvcTestParameters::Create(kAv1CodecName, "L3T2_KEY_SHIFT"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T3"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T3h"),
-                SvcTestParameters::Create(kAv1CodecName, "L3T3_KEY"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T3"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T3h"),
+                // SvcTestParameters::Create(kAv1CodecName, "L3T3_KEY"),
                 // SvcTestParameters::Create(kAv1CodecName, "L3T3_KEY_SHIFT"),
                 SvcTestParameters::Create(kAv1CodecName, "S2T1"),
                 SvcTestParameters::Create(kAv1CodecName, "S2T1h"),
@@ -492,12 +492,14 @@ INSTANTIATE_TEST_SUITE_P(
                 SvcTestParameters::Create(kAv1CodecName, "S2T2h"),
                 SvcTestParameters::Create(kAv1CodecName, "S2T3"),
                 SvcTestParameters::Create(kAv1CodecName, "S2T3h"),
-                SvcTestParameters::Create(kAv1CodecName, "S3T1"),
-                SvcTestParameters::Create(kAv1CodecName, "S3T1h"),
-                SvcTestParameters::Create(kAv1CodecName, "S3T2"),
-                SvcTestParameters::Create(kAv1CodecName, "S3T2h"),
-                SvcTestParameters::Create(kAv1CodecName, "S3T3"),
-                SvcTestParameters::Create(kAv1CodecName, "S3T3h"),
+                // TODO(bugs.webrtc.org/15666): Investigate and reenable AV1
+                // S3 tests.
+                // SvcTestParameters::Create(kAv1CodecName, "S3T1"),
+                // SvcTestParameters::Create(kAv1CodecName, "S3T1h"),
+                // SvcTestParameters::Create(kAv1CodecName, "S3T2"),
+                // SvcTestParameters::Create(kAv1CodecName, "S3T2h"),
+                // SvcTestParameters::Create(kAv1CodecName, "S3T3"),
+                // SvcTestParameters::Create(kAv1CodecName, "S3T3h"),
             }),
             Values(UseDependencyDescriptor::Enabled)),
     SvcTestNameGenerator);