diff options
author | Artem Titov <titovartem@webrtc.org> | 2020-07-13 15:41:11 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-07-13 15:41:39 +0000 |
commit | f60d4c2dfef57b1abe91a30ef50547d0fa2429e4 (patch) | |
tree | 60693e771805a266fd87324c98469ba639989d51 /pc | |
parent | 6e4416cd890ed4ef0ac96772d28b4048f2d1d202 (diff) | |
download | webrtc-f60d4c2dfef57b1abe91a30ef50547d0fa2429e4.tar.gz |
Revert "Delete PeerConnectionInterface::BitrateParameters"
This reverts commit e2dfe74b0e29558ddea6473d0272bc38c838370c.
Reason for revert: Breaks downstream project
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=deadbeef@webrtc.org,ilnik@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,kthelgason@webrtc.org
Change-Id: Ia62b3c43996e95668d7972882baf06a186a539d3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179221
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31719}
Diffstat (limited to 'pc')
-rw-r--r-- | pc/peer_connection_interface_unittest.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc index 901e5c572c..9251511747 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(); - BitrateSettings bitrate; - bitrate.start_bitrate_bps = 100000; + PeerConnectionInterface::BitrateParameters bitrate; + bitrate.current_bitrate_bps = 100000; EXPECT_TRUE(pc_->SetBitrate(bitrate).ok()); } TEST_P(PeerConnectionInterfaceTest, SetBitrateNegativeMinFails) { CreatePeerConnection(); - BitrateSettings bitrate; + PeerConnectionInterface::BitrateParameters bitrate; bitrate.min_bitrate_bps = -1; EXPECT_FALSE(pc_->SetBitrate(bitrate).ok()); } TEST_P(PeerConnectionInterfaceTest, SetBitrateCurrentLessThanMinFails) { CreatePeerConnection(); - BitrateSettings bitrate; + PeerConnectionInterface::BitrateParameters bitrate; bitrate.min_bitrate_bps = 5; - bitrate.start_bitrate_bps = 3; + bitrate.current_bitrate_bps = 3; EXPECT_FALSE(pc_->SetBitrate(bitrate).ok()); } TEST_P(PeerConnectionInterfaceTest, SetBitrateCurrentNegativeFails) { CreatePeerConnection(); - BitrateSettings bitrate; - bitrate.start_bitrate_bps = -1; + PeerConnectionInterface::BitrateParameters bitrate; + bitrate.current_bitrate_bps = -1; EXPECT_FALSE(pc_->SetBitrate(bitrate).ok()); } TEST_P(PeerConnectionInterfaceTest, SetBitrateMaxLessThanCurrentFails) { CreatePeerConnection(); - BitrateSettings bitrate; - bitrate.start_bitrate_bps = 10; + PeerConnectionInterface::BitrateParameters bitrate; + bitrate.current_bitrate_bps = 10; bitrate.max_bitrate_bps = 8; EXPECT_FALSE(pc_->SetBitrate(bitrate).ok()); } TEST_P(PeerConnectionInterfaceTest, SetBitrateMaxLessThanMinFails) { CreatePeerConnection(); - BitrateSettings bitrate; + PeerConnectionInterface::BitrateParameters 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(); - BitrateSettings bitrate; + PeerConnectionInterface::BitrateParameters 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(); - BitrateSettings bitrate; - bitrate.start_bitrate_bps = 1; + PeerConnectionInterface::BitrateParameters bitrate; + bitrate.current_bitrate_bps = 1; EXPECT_TRUE(pc_->SetBitrate(bitrate).ok()); } |