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}
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 98d90fd..571b89a 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -379,6 +379,7 @@
":stats_observer_interface",
":video_quality_analyzer_api",
"../media:rtc_media_base",
+ "../rtc_base:deprecation",
"../rtc_base:rtc_base",
"rtc_event_log",
"task_queue",
diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h
index 8c81a90..3573687 100644
--- a/api/test/peerconnection_quality_test_fixture.h
+++ b/api/test/peerconnection_quality_test_fixture.h
@@ -39,6 +39,7 @@
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
#include "media/base/media_constants.h"
+#include "rtc_base/deprecation.h"
#include "rtc_base/network.h"
#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/ssl_certificate.h"
@@ -334,6 +335,9 @@
PeerConnectionInterface::RTCConfiguration configuration) = 0;
// Set bitrate parameters on PeerConnection. This constraints will be
// applied to all summed RTP streams for this peer.
+ virtual PeerConfigurer* SetBitrateSettings(
+ BitrateSettings bitrate_settings) = 0;
+ RTC_DEPRECATED
virtual PeerConfigurer* SetBitrateParameters(
PeerConnectionInterface::BitrateParameters bitrate_params) = 0;
};
diff --git a/test/pc/e2e/peer_configurer.h b/test/pc/e2e/peer_configurer.h
index a10dda6..7da547b 100644
--- a/test/pc/e2e/peer_configurer.h
+++ b/test/pc/e2e/peer_configurer.h
@@ -165,7 +165,15 @@
}
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 431f591..ab6aaa0 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 @@
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 002e6ec..edefc7a 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 @@
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 d9e7fc8..f700f1c 100644
--- a/test/pc/e2e/test_peer_factory.cc
+++ b/test/pc/e2e/test_peer_factory.cc
@@ -329,7 +329,7 @@
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),
diff --git a/video/pc_full_stack_tests.cc b/video/pc_full_stack_tests.cc
index bcc92a3..8a6029c 100644
--- a/video/pc_full_stack_tests.cc
+++ b/video/pc_full_stack_tests.cc
@@ -281,11 +281,11 @@
video, ClipNameToClipPath("foreman_cif"));
alice->AddVideoConfig(std::move(video), std::move(frame_generator));
- PeerConnectionInterface::BitrateParameters bitrate_params;
- bitrate_params.min_bitrate_bps = 30000;
- bitrate_params.current_bitrate_bps = 30000;
- bitrate_params.max_bitrate_bps = 30000;
- alice->SetBitrateParameters(bitrate_params);
+ BitrateSettings bitrate_settings;
+ bitrate_settings.min_bitrate_bps = 30000;
+ bitrate_settings.start_bitrate_bps = 30000;
+ bitrate_settings.max_bitrate_bps = 30000;
+ alice->SetBitrateSettings(bitrate_settings);
},
[](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::Seconds(kTestDurationSec));
@@ -314,11 +314,11 @@
video, ClipNameToClipPath("foreman_cif"));
alice->AddVideoConfig(std::move(video), std::move(frame_generator));
- PeerConnectionInterface::BitrateParameters bitrate_params;
- bitrate_params.min_bitrate_bps = 30000;
- bitrate_params.current_bitrate_bps = 30000;
- bitrate_params.max_bitrate_bps = 30000;
- alice->SetBitrateParameters(bitrate_params);
+ BitrateSettings bitrate_settings;
+ bitrate_settings.min_bitrate_bps = 30000;
+ bitrate_settings.start_bitrate_bps = 30000;
+ bitrate_settings.max_bitrate_bps = 30000;
+ alice->SetBitrateSettings(bitrate_settings);
},
[](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::Seconds(kTestDurationSec));
@@ -619,11 +619,11 @@
video, ClipNameToClipPath("foreman_cif"));
alice->AddVideoConfig(std::move(video), std::move(frame_generator));
- PeerConnectionInterface::BitrateParameters bitrate_params;
- bitrate_params.min_bitrate_bps = 30000;
- bitrate_params.current_bitrate_bps = 30000;
- bitrate_params.max_bitrate_bps = 30000;
- alice->SetBitrateParameters(bitrate_params);
+ BitrateSettings bitrate_settings;
+ bitrate_settings.min_bitrate_bps = 30000;
+ bitrate_settings.start_bitrate_bps = 30000;
+ bitrate_settings.max_bitrate_bps = 30000;
+ alice->SetBitrateSettings(bitrate_settings);
},
[](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::Seconds(kTestDurationSec));
