From 6be448fa454128ff0c3a1d16d4d9c966428b499a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Mon, 27 Mar 2023 12:51:51 +0000 Subject: [PATCH] Revert "Add legacy SVC test that all layers can be inactivated." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cac9a55ddf0ba33f7407f707b69d66d01c49073b. Reason for revert: WebRTC importer consistently fails this test. Original change's description: > Add legacy SVC test that all layers can be inactivated. > > A larger version of this test was previously landed but got reverted > due to failures only happening on the importer bot (not on the CQ or > locally). > > This is a smaller version of the test that does something we should > support: being able to inactive all encodings of a VP9 legacy SVC > stream. > > Let's land and see if any issues are reproducible (expecting revert). > > Bug: webrtc:15033 > Change-Id: I88da1facf4ef05299f3392b86a0e3df029ebe264 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299006 > Commit-Queue: Henrik Boström > Reviewed-by: Evan Shrubsole > Cr-Commit-Position: refs/heads/main@{#39684} Bug: webrtc:15033 Change-Id: Ia31f125bd6782ed38653c1e5cdcc29a8a0eff874 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299145 Reviewed-by: Andrey Logvin Commit-Queue: Andrey Logvin Commit-Queue: Henrik Boström Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Auto-Submit: Henrik Boström Cr-Commit-Position: refs/heads/main@{#39686} --- pc/peer_connection_simulcast_unittest.cc | 37 ------------------------ 1 file changed, 37 deletions(-) diff --git a/pc/peer_connection_simulcast_unittest.cc b/pc/peer_connection_simulcast_unittest.cc index ff40407884..23d598cc0a 100644 --- a/pc/peer_connection_simulcast_unittest.cc +++ b/pc/peer_connection_simulcast_unittest.cc @@ -1560,43 +1560,6 @@ TEST_F(PeerConnectionSimulcastWithMediaFlowTests, EXPECT_FALSE(parameters.encodings[2].scalability_mode.has_value()); } -TEST_F(PeerConnectionSimulcastWithMediaFlowTests, - SendingThreeEncodings_VP9_LegacySVC_AllLayersInactive) { - rtc::scoped_refptr local_pc_wrapper = CreatePc(); - rtc::scoped_refptr remote_pc_wrapper = CreatePc(); - ExchangeIceCandidates(local_pc_wrapper, remote_pc_wrapper); - - std::vector layers = - CreateLayers({"f", "h", "q"}, /*active=*/true); - rtc::scoped_refptr transceiver = - AddTransceiverWithSimulcastLayers(local_pc_wrapper, remote_pc_wrapper, - layers); - std::vector codecs = - GetCapabilitiesAndRestrictToCodec(local_pc_wrapper, "VP9"); - transceiver->SetCodecPreferences(codecs); - - // Legacy SVC mode and all layers inactive. - rtc::scoped_refptr sender = transceiver->sender(); - RtpParameters parameters = sender->GetParameters(); - ASSERT_EQ(parameters.encodings.size(), 3u); - parameters.encodings[0].active = false; - parameters.encodings[1].active = false; - parameters.encodings[2].active = false; - sender->SetParameters(parameters); - - NegotiateWithSimulcastTweaks(local_pc_wrapper, remote_pc_wrapper, layers); - local_pc_wrapper->WaitForConnection(); - remote_pc_wrapper->WaitForConnection(); - - // Ensure no media is flowing (1 second should be enough). - rtc::Thread::Current()->SleepMs(1000); - rtc::scoped_refptr report = GetStats(local_pc_wrapper); - std::vector outbound_rtps = - report->GetStatsOfType(); - ASSERT_THAT(outbound_rtps, SizeIs(1u)); - EXPECT_EQ(*outbound_rtps[0]->bytes_sent, 0u); -} - TEST_F(PeerConnectionSimulcastWithMediaFlowTests, SendingThreeEncodings_VP9_StandardL1T3_AllLayersInactive) { rtc::scoped_refptr local_pc_wrapper = CreatePc();