aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/BUILD.gn1
-rw-r--r--api/peer_connection_interface.cc21
-rw-r--r--api/peer_connection_interface.h17
-rw-r--r--api/test/compile_all_headers.cc1
-rw-r--r--api/test/dummy_peer_connection.h4
-rw-r--r--api/test/mock_peerconnectioninterface.h1
-rw-r--r--api/test/peerconnection_quality_test_fixture.h4
-rw-r--r--pc/peer_connection_interface_unittest.cc26
-rw-r--r--sdk/android/src/jni/pc/peer_connection.cc4
-rw-r--r--sdk/objc/api/peerconnection/RTCPeerConnection.mm4
-rw-r--r--test/pc/e2e/peer_configurer.h8
11 files changed, 19 insertions, 72 deletions
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 560cabccc7..37473eafe3 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -381,7 +381,6 @@ rtc_source_set("peer_connection_quality_test_fixture_api") {
":track_id_stream_info_map",
":video_quality_analyzer_api",
"../media:rtc_media_base",
- "../rtc_base:deprecation",
"../rtc_base:rtc_base",
"rtc_event_log",
"task_queue",
diff --git a/api/peer_connection_interface.cc b/api/peer_connection_interface.cc
index 0c25405784..f82e84b80f 100644
--- a/api/peer_connection_interface.cc
+++ b/api/peer_connection_interface.cc
@@ -53,27 +53,6 @@ RTCError PeerConnectionInterface::SetConfiguration(
return RTCError();
}
-RTCError PeerConnectionInterface::SetBitrate(const BitrateSettings& bitrate) {
- BitrateParameters bitrate_parameters;
- bitrate_parameters.min_bitrate_bps = bitrate.min_bitrate_bps;
- bitrate_parameters.current_bitrate_bps = bitrate.start_bitrate_bps;
- bitrate_parameters.max_bitrate_bps = bitrate.max_bitrate_bps;
- return SetBitrate(bitrate_parameters);
-}
-
-RTCError PeerConnectionInterface::SetBitrate(
- const BitrateParameters& bitrate_parameters) {
- BitrateSettings bitrate;
- bitrate.min_bitrate_bps = bitrate_parameters.min_bitrate_bps;
- bitrate.start_bitrate_bps = bitrate_parameters.current_bitrate_bps;
- bitrate.max_bitrate_bps = bitrate_parameters.max_bitrate_bps;
- return SetBitrate(bitrate);
-}
-
-PeerConnectionInterface::BitrateParameters::BitrateParameters() = default;
-
-PeerConnectionInterface::BitrateParameters::~BitrateParameters() = default;
-
PeerConnectionDependencies::PeerConnectionDependencies(
PeerConnectionObserver* observer_in)
: observer(observer_in) {}
diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h
index 2664af4e5e..fd4d2df6a7 100644
--- a/api/peer_connection_interface.h
+++ b/api/peer_connection_interface.h
@@ -1015,28 +1015,13 @@ class RTC_EXPORT PeerConnectionInterface : public rtc::RefCountInterface {
virtual bool RemoveIceCandidates(
const std::vector<cricket::Candidate>& candidates) = 0;
- // 0 <= min <= current <= max should hold for set parameters.
- struct BitrateParameters {
- BitrateParameters();
- ~BitrateParameters();
-
- absl::optional<int> min_bitrate_bps;
- absl::optional<int> current_bitrate_bps;
- absl::optional<int> max_bitrate_bps;
- };
-
// SetBitrate limits the bandwidth allocated for all RTP streams sent by
// this PeerConnection. Other limitations might affect these limits and
// are respected (for example "b=AS" in SDP).
//
// Setting |current_bitrate_bps| will reset the current bitrate estimate
// to the provided value.
- virtual RTCError SetBitrate(const BitrateSettings& bitrate);
-
- // TODO(nisse): Deprecated - use version above. These two default
- // implementations require subclasses to implement one or the other
- // of the methods.
- virtual RTCError SetBitrate(const BitrateParameters& bitrate_parameters);
+ virtual RTCError SetBitrate(const BitrateSettings& bitrate) = 0;
// Enable/disable playout of received audio streams. Enabled by default. Note
// that even if playout is enabled, streams will only be played out if the
diff --git a/api/test/compile_all_headers.cc b/api/test/compile_all_headers.cc
index 44b9b1fe68..4cece5b286 100644
--- a/api/test/compile_all_headers.cc
+++ b/api/test/compile_all_headers.cc
@@ -27,6 +27,7 @@
// "api/test/videocodec_test_fixture.h"
// "api/test/videocodec_test_stats.h"
+#include "api/test/dummy_peer_connection.h"
#include "api/test/fake_frame_decryptor.h"
#include "api/test/fake_frame_encryptor.h"
#include "api/test/mock_audio_mixer.h"
diff --git a/api/test/dummy_peer_connection.h b/api/test/dummy_peer_connection.h
index 102b0684c0..97a97d0c81 100644
--- a/api/test/dummy_peer_connection.h
+++ b/api/test/dummy_peer_connection.h
@@ -194,10 +194,6 @@ class DummyPeerConnection : public PeerConnectionInterface {
return RTCError(RTCErrorType::UNSUPPORTED_OPERATION, "Not implemented");
}
- RTCError SetBitrate(const BitrateParameters& bitrate_parameters) override {
- return RTCError(RTCErrorType::UNSUPPORTED_OPERATION, "Not implemented");
- }
-
void SetAudioPlayout(bool playout) override { FATAL() << "Not implemented"; }
void SetAudioRecording(bool recording) override {
FATAL() << "Not implemented";
diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h
index 6b247b7cee..be34df0b32 100644
--- a/api/test/mock_peerconnectioninterface.h
+++ b/api/test/mock_peerconnectioninterface.h
@@ -167,7 +167,6 @@ class MockPeerConnectionInterface
(const std::vector<cricket::Candidate>&),
(override));
MOCK_METHOD(RTCError, SetBitrate, (const BitrateSettings&), (override));
- MOCK_METHOD(RTCError, SetBitrate, (const BitrateParameters&), (override));
MOCK_METHOD(void, SetAudioPlayout, (bool), (override));
MOCK_METHOD(void, SetAudioRecording, (bool), (override));
MOCK_METHOD(rtc::scoped_refptr<DtlsTransportInterface>,
diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h
index 6dc119fb24..f370478956 100644
--- a/api/test/peerconnection_quality_test_fixture.h
+++ b/api/test/peerconnection_quality_test_fixture.h
@@ -40,7 +40,6 @@
#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"
@@ -336,9 +335,6 @@ class PeerConnectionE2EQualityTestFixture {
// 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;
};
// Contains configuration for echo emulator.
diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc
index 9251511747..901e5c572c 100644
--- a/pc/peer_connection_interface_unittest.cc
+++ b/pc/peer_connection_interface_unittest.cc
@@ -3615,44 +3615,44 @@ TEST_P(PeerConnectionInterfaceTest,
TEST_P(PeerConnectionInterfaceTest, SetBitrateWithoutMinSucceeds) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
- bitrate.current_bitrate_bps = 100000;
+ BitrateSettings bitrate;
+ bitrate.start_bitrate_bps = 100000;
EXPECT_TRUE(pc_->SetBitrate(bitrate).ok());
}
TEST_P(PeerConnectionInterfaceTest, SetBitrateNegativeMinFails) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
+ BitrateSettings bitrate;
bitrate.min_bitrate_bps = -1;
EXPECT_FALSE(pc_->SetBitrate(bitrate).ok());
}
TEST_P(PeerConnectionInterfaceTest, SetBitrateCurrentLessThanMinFails) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
+ BitrateSettings bitrate;
bitrate.min_bitrate_bps = 5;
- bitrate.current_bitrate_bps = 3;
+ bitrate.start_bitrate_bps = 3;
EXPECT_FALSE(pc_->SetBitrate(bitrate).ok());
}
TEST_P(PeerConnectionInterfaceTest, SetBitrateCurrentNegativeFails) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
- bitrate.current_bitrate_bps = -1;
+ BitrateSettings bitrate;
+ bitrate.start_bitrate_bps = -1;
EXPECT_FALSE(pc_->SetBitrate(bitrate).ok());
}
TEST_P(PeerConnectionInterfaceTest, SetBitrateMaxLessThanCurrentFails) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
- bitrate.current_bitrate_bps = 10;
+ BitrateSettings bitrate;
+ bitrate.start_bitrate_bps = 10;
bitrate.max_bitrate_bps = 8;
EXPECT_FALSE(pc_->SetBitrate(bitrate).ok());
}
TEST_P(PeerConnectionInterfaceTest, SetBitrateMaxLessThanMinFails) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
+ BitrateSettings bitrate;
bitrate.min_bitrate_bps = 10;
bitrate.max_bitrate_bps = 8;
EXPECT_FALSE(pc_->SetBitrate(bitrate).ok());
@@ -3660,7 +3660,7 @@ TEST_P(PeerConnectionInterfaceTest, SetBitrateMaxLessThanMinFails) {
TEST_P(PeerConnectionInterfaceTest, SetBitrateMaxNegativeFails) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
+ BitrateSettings bitrate;
bitrate.max_bitrate_bps = -1;
EXPECT_FALSE(pc_->SetBitrate(bitrate).ok());
}
@@ -3671,8 +3671,8 @@ TEST_P(PeerConnectionInterfaceTest, SetBitrateMaxNegativeFails) {
// be clamped succeeds.
TEST_P(PeerConnectionInterfaceTest, SetBitrateCurrentLessThanImplicitMin) {
CreatePeerConnection();
- PeerConnectionInterface::BitrateParameters bitrate;
- bitrate.current_bitrate_bps = 1;
+ BitrateSettings bitrate;
+ bitrate.start_bitrate_bps = 1;
EXPECT_TRUE(pc_->SetBitrate(bitrate).ok());
}
diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc
index 05e940ee80..9cebda3813 100644
--- a/sdk/android/src/jni/pc/peer_connection.cc
+++ b/sdk/android/src/jni/pc/peer_connection.cc
@@ -758,9 +758,9 @@ static jboolean JNI_PeerConnection_SetBitrate(
const JavaParamRef<jobject>& j_min,
const JavaParamRef<jobject>& j_current,
const JavaParamRef<jobject>& j_max) {
- PeerConnectionInterface::BitrateParameters params;
+ BitrateSettings params;
params.min_bitrate_bps = JavaToNativeOptionalInt(jni, j_min);
- params.current_bitrate_bps = JavaToNativeOptionalInt(jni, j_current);
+ params.start_bitrate_bps = JavaToNativeOptionalInt(jni, j_current);
params.max_bitrate_bps = JavaToNativeOptionalInt(jni, j_max);
return ExtractNativePC(jni, j_pc)->SetBitrate(params).ok();
}
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
index 9e561fc65f..42a43a79cd 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
@@ -558,12 +558,12 @@ void PeerConnectionDelegateAdapter::OnRemoveTrack(
- (BOOL)setBweMinBitrateBps:(nullable NSNumber *)minBitrateBps
currentBitrateBps:(nullable NSNumber *)currentBitrateBps
maxBitrateBps:(nullable NSNumber *)maxBitrateBps {
- webrtc::PeerConnectionInterface::BitrateParameters params;
+ webrtc::BitrateSettings params;
if (minBitrateBps != nil) {
params.min_bitrate_bps = absl::optional<int>(minBitrateBps.intValue);
}
if (currentBitrateBps != nil) {
- params.current_bitrate_bps = absl::optional<int>(currentBitrateBps.intValue);
+ params.start_bitrate_bps = absl::optional<int>(currentBitrateBps.intValue);
}
if (maxBitrateBps != nil) {
params.max_bitrate_bps = absl::optional<int>(maxBitrateBps.intValue);
diff --git a/test/pc/e2e/peer_configurer.h b/test/pc/e2e/peer_configurer.h
index 7da547bdc3..422d3d7341 100644
--- a/test/pc/e2e/peer_configurer.h
+++ b/test/pc/e2e/peer_configurer.h
@@ -163,14 +163,6 @@ class PeerConfigurerImpl final
params_->rtc_configuration = std::move(configuration);
return this;
}
- PeerConfigurer* SetBitrateParameters(
- PeerConnectionInterface::BitrateParameters bitrate_params) override {
- 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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 04:25:23 +0000