| Index: webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| index 4c8599008ab49dbef6ca365ad461b0759357ce90..b25b77911d962491ddb3dfe662fb13e99bcf10a0 100644
|
| --- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| +++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
|
| @@ -395,8 +395,7 @@ class WebRtcVoiceEngineTestFake : public testing::Test {
|
| int expected_min_bitrate_bps,
|
| const char* start_bitrate_kbps,
|
| int expected_start_bitrate_bps,
|
| - const char* max_bitrate_kbps,
|
| - int expected_max_bitrate_bps) {
|
| + const char* max_bitrate_kbps) {
|
| EXPECT_TRUE(SetupSendStream());
|
| auto& codecs = send_parameters_.codecs;
|
| codecs.clear();
|
| @@ -410,8 +409,6 @@ class WebRtcVoiceEngineTestFake : public testing::Test {
|
| call_.GetConfig().bitrate_config.min_bitrate_bps);
|
| EXPECT_EQ(expected_start_bitrate_bps,
|
| call_.GetConfig().bitrate_config.start_bitrate_bps);
|
| - EXPECT_EQ(expected_max_bitrate_bps,
|
| - call_.GetConfig().bitrate_config.max_bitrate_bps);
|
| }
|
|
|
| void TestSetSendRtpHeaderExtensions(const std::string& ext) {
|
| @@ -1486,27 +1483,25 @@ TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecOpusMaxAverageBitrate) {
|
| }
|
|
|
| TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecsWithBitrates) {
|
| - SetSendCodecsShouldWorkForBitrates("100", 100000, "150", 150000, "200",
|
| - 200000);
|
| + SetSendCodecsShouldWorkForBitrates("100", 100000, "150", 150000, "200");
|
| }
|
|
|
| TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecsWithHighMaxBitrate) {
|
| - SetSendCodecsShouldWorkForBitrates("", 0, "", -1, "10000", 10000000);
|
| + SetSendCodecsShouldWorkForBitrates("", 0, "", -1, "10000");
|
| }
|
|
|
| TEST_F(WebRtcVoiceEngineTestFake,
|
| SetSendCodecsWithoutBitratesUsesCorrectDefaults) {
|
| - SetSendCodecsShouldWorkForBitrates("", 0, "", -1, "", -1);
|
| + SetSendCodecsShouldWorkForBitrates("", 0, "", -1, "");
|
| }
|
|
|
| TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecsCapsMinAndStartBitrate) {
|
| - SetSendCodecsShouldWorkForBitrates("-1", 0, "-100", -1, "", -1);
|
| + SetSendCodecsShouldWorkForBitrates("-1", 0, "-100", -1, "");
|
| }
|
|
|
| TEST_F(WebRtcVoiceEngineTestFake,
|
| SetMaxSendBandwidthShouldPreserveOtherBitrates) {
|
| - SetSendCodecsShouldWorkForBitrates("100", 100000, "150", 150000, "200",
|
| - 200000);
|
| + SetSendCodecsShouldWorkForBitrates("100", 100000, "150", 150000, "200");
|
| send_parameters_.max_bandwidth_bps = 300000;
|
| SetSendParameters(send_parameters_);
|
| EXPECT_EQ(100000, call_.GetConfig().bitrate_config.min_bitrate_bps)
|
|
|