diff options
| author | Niels Möller <nisse@webrtc.org> | 2020-06-22 14:48:10 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-24 12:07:06 +0000 |
| commit | 29d59a14024890d731633c34a621140d167fc64d (patch) | |
| tree | 27eda894b4ccc5ca243de0d34921f0e7b8dbed73 /test | |
| parent | d95138b684b82527b8ccd1ccc631b5ff550de320 (diff) | |
| download | webrtc-29d59a14024890d731633c34a621140d167fc64d.tar.gz | |
Add method PeerConfigurer::SetBitrateSettings
It replaces the method SetBitrateParameters, which uses the
deprecated type PeerConnectionInterface::BitrateParameters.
Bug: None
No-try: True
Change-Id: I3690d391d679c3ff5b79e088f6c7f79bc3571064
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177667
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31557}
Diffstat (limited to 'test')
| -rw-r--r-- | test/pc/e2e/peer_configurer.h | 10 | ||||
| -rw-r--r-- | test/pc/e2e/peer_connection_e2e_smoke_test.cc | 8 | ||||
| -rw-r--r-- | test/pc/e2e/peer_connection_quality_test_params.h | 2 | ||||
| -rw-r--r-- | test/pc/e2e/test_peer_factory.cc | 2 |
4 files changed, 15 insertions, 7 deletions
diff --git a/test/pc/e2e/peer_configurer.h b/test/pc/e2e/peer_configurer.h index a10dda6a65..7da547bdc3 100644 --- a/test/pc/e2e/peer_configurer.h +++ b/test/pc/e2e/peer_configurer.h @@ -165,7 +165,15 @@ class PeerConfigurerImpl final } PeerConfigurer* SetBitrateParameters( PeerConnectionInterface::BitrateParameters bitrate_params) override { - params_->bitrate_params = bitrate_params; + BitrateSettings bitrate_settings; + bitrate_settings.min_bitrate_bps = bitrate_params.min_bitrate_bps; + bitrate_settings.start_bitrate_bps = bitrate_params.current_bitrate_bps; + bitrate_settings.max_bitrate_bps = bitrate_params.max_bitrate_bps; + return SetBitrateSettings(bitrate_settings); + } + PeerConfigurer* SetBitrateSettings( + BitrateSettings bitrate_settings) override { + params_->bitrate_settings = bitrate_settings; return this; } diff --git a/test/pc/e2e/peer_connection_e2e_smoke_test.cc b/test/pc/e2e/peer_connection_e2e_smoke_test.cc index 431f591ffe..ab6aaa0731 100644 --- a/test/pc/e2e/peer_connection_e2e_smoke_test.cc +++ b/test/pc/e2e/peer_connection_e2e_smoke_test.cc @@ -308,10 +308,10 @@ TEST_F(PeerConnectionE2EQualityTestSmokeTest, MAYBE_HighBitrate) { RunTest( "smoke", run_params, [](PeerConfigurer* alice) { - PeerConnectionInterface::BitrateParameters bitrate_params; - bitrate_params.current_bitrate_bps = 3'000'000; - bitrate_params.max_bitrate_bps = 3'000'000; - alice->SetBitrateParameters(bitrate_params); + BitrateSettings bitrate_settings; + bitrate_settings.start_bitrate_bps = 3'000'000; + bitrate_settings.max_bitrate_bps = 3'000'000; + alice->SetBitrateSettings(bitrate_settings); VideoConfig video(800, 600, 15); video.stream_label = "alice-video"; video.min_encode_bitrate_bps = 500'000; diff --git a/test/pc/e2e/peer_connection_quality_test_params.h b/test/pc/e2e/peer_connection_quality_test_params.h index 002e6ec20b..edefc7a008 100644 --- a/test/pc/e2e/peer_connection_quality_test_params.h +++ b/test/pc/e2e/peer_connection_quality_test_params.h @@ -112,7 +112,7 @@ struct Params { absl::optional<std::string> aec_dump_path; PeerConnectionInterface::RTCConfiguration rtc_configuration; - PeerConnectionInterface::BitrateParameters bitrate_params; + BitrateSettings bitrate_settings; }; } // namespace webrtc_pc_e2e diff --git a/test/pc/e2e/test_peer_factory.cc b/test/pc/e2e/test_peer_factory.cc index d9e7fc82f7..f700f1cb78 100644 --- a/test/pc/e2e/test_peer_factory.cc +++ b/test/pc/e2e/test_peer_factory.cc @@ -329,7 +329,7 @@ std::unique_ptr<TestPeer> TestPeerFactory::CreateTestPeer( rtc::scoped_refptr<PeerConnectionInterface> peer_connection = peer_connection_factory->CreatePeerConnection(params->rtc_configuration, std::move(pc_deps)); - peer_connection->SetBitrate(params->bitrate_params); + peer_connection->SetBitrate(params->bitrate_settings); return absl::WrapUnique(new TestPeer( peer_connection_factory, peer_connection, std::move(observer), |