From e2a2278b2ffbacec4719706aed19009564c04a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Mon, 27 Mar 2023 13:32:21 +0200 Subject: [PATCH] PeerConnectionSimulcastWithMediaFlowTests: specify scaleResolutionDownBy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update some uses of scalabilityMode to also set scaleResolutionDownBy. Nothing changes in these tests because they were either single stream cases, fallback was happening anyway or the test was doing VP8, but by specifying scaleResolutionDownBy we make these tests consistent and explicit about wanting to exercise the "standard path". Partly a style thing and partly not wanting the test to pass for the wrong reason. Bug: None Change-Id: I1d2e688976a4e6c160e90474e2416a18d795d41b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299078 Auto-Submit: Henrik Boström Reviewed-by: Evan Shrubsole Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/main@{#39685} --- pc/peer_connection_simulcast_unittest.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pc/peer_connection_simulcast_unittest.cc b/pc/peer_connection_simulcast_unittest.cc index f47ed3808b..ff40407884 100644 --- a/pc/peer_connection_simulcast_unittest.cc +++ b/pc/peer_connection_simulcast_unittest.cc @@ -1208,6 +1208,7 @@ TEST_F(PeerConnectionSimulcastWithMediaFlowTests, RtpParameters parameters = sender->GetParameters(); ASSERT_EQ(parameters.encodings.size(), 1u); parameters.encodings[0].scalability_mode = "L3T3_KEY"; + parameters.encodings[0].scale_resolution_down_by = 1; EXPECT_FALSE(sender->SetParameters(parameters).ok()); // `scalability_mode` remains unset because SetParameters() failed. parameters = sender->GetParameters(); @@ -1258,6 +1259,7 @@ TEST_F(PeerConnectionSimulcastWithMediaFlowTests, RtpParameters parameters = sender->GetParameters(); ASSERT_EQ(parameters.encodings.size(), 1u); parameters.encodings[0].scalability_mode = "L3T3_KEY"; + parameters.encodings[0].scale_resolution_down_by = 1; EXPECT_TRUE(sender->SetParameters(parameters).ok()); // Verify fallback has not happened yet. parameters = sender->GetParameters(); @@ -1408,6 +1410,7 @@ TEST_F(PeerConnectionSimulcastWithMediaFlowTests, RtpParameters parameters = sender->GetParameters(); ASSERT_EQ(parameters.encodings.size(), 1u); parameters.encodings[0].scalability_mode = "L3T3_KEY"; + parameters.encodings[0].scale_resolution_down_by = 1; EXPECT_TRUE(sender->SetParameters(parameters).ok()); NegotiateWithSimulcastTweaks(local_pc_wrapper, remote_pc_wrapper, layers);