zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Delete PeerConnectionInterface::BitrateParameters"

Browse Source 
This is a reland of e2dfe74b0e29558ddea6473d0272bc38c838370c
Downstream breakage has been fixed.

Original change's description:
> Delete PeerConnectionInterface::BitrateParameters
>
> Replaced by the api struct BitrateSettings, added in
> https://webrtc-review.googlesource.com/74020
>
> Bug: None
> Change-Id: I8b50b32f5c7a8918fad675904d913a21fd905274
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177665
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Reviewed-by: Taylor <deadbeef@webrtc.org>
> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31714}

Tbr: kwiberg@webrtc.org
Bug: None
Change-Id: Ic039e51f9f842329525887a28d1cb9819addc74b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179282
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31728}
This commit is contained in:
Niels Möller
2020-07-13 10:25:41 +02:00
committed by Commit Bot
parent c888ffa57f
commit 9ad1f6feca
11 changed files with 19 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pc/peer_connection_interface_unittest.cc
View File

@ -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());
}