Enable setting the maximum bitrate limit in RtpSender.

webrtc/media/engine/webrtcvoiceengine_unittest.cc

 /*
  *  Copyright (c) 2008 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 182 matching lines @@
     parameters.codecs.push_back(codec);
     parameters.max_bandwidth_bps = max_bitrate;
     EXPECT_EQ(expected_result, channel_->SetSendParameters(parameters));
 
     int channel_num = voe_.GetLastChannel();
     webrtc::CodecInst temp_codec;
     EXPECT_FALSE(voe_.GetSendCodec(channel_num, temp_codec));
     EXPECT_EQ(expected_bitrate, temp_codec.rate);
   }
 
+  void TestSendStreamBitrate(const cricket::AudioCodec& codec,
+                             int max_bitrate_global,
+                             int max_bitrate_ssrc,
+                             bool expected_result,
+                             int expected_bitrate) {
+    // clear the bitrate limit from the previous test case
+    webrtc::RTCRtpParameters rtp_parameters =
+        channel_->GetRtpParameters(kSsrc1);
+    EXPECT_EQ(1UL, rtp_parameters.encodings.size());
+    rtp_parameters.encodings[0].max_bitrate_bps = -1;
+    EXPECT_TRUE(channel_->SetRtpParameters(kSsrc1, rtp_parameters));
+
+    // Attempt to set the requested bitrate limits
+    cricket::AudioSendParameters send_parameters;
+    send_parameters.codecs.push_back(codec);
+    send_parameters.max_bandwidth_bps = max_bitrate_global;
+    EXPECT_TRUE(channel_->SetSendParameters(send_parameters));
+
+    rtp_parameters.encodings[0].max_bitrate_bps = max_bitrate_ssrc;
+    EXPECT_EQ(expected_result,
+              channel_->SetRtpParameters(kSsrc1, rtp_parameters));
+
+    // Verify that reading back the parameters gives results
+    // consistent with the Set() result
+    webrtc::RTCRtpParameters resulting_parameters =
+        channel_->GetRtpParameters(kSsrc1);
+    EXPECT_EQ(1UL, resulting_parameters.encodings.size());
+    EXPECT_EQ(expected_result ? max_bitrate_ssrc : -1,
+              resulting_parameters.encodings[0].max_bitrate_bps);
+
+    // Verify that the codec settings have the expected bitrate
+    int channel_num = voe_.GetLastChannel();
+    webrtc::CodecInst temp_codec;
+    EXPECT_FALSE(voe_.GetSendCodec(channel_num, temp_codec));
+    EXPECT_EQ(expected_bitrate, temp_codec.rate);
+  }
+
   void TestSetSendRtpHeaderExtensions(const std::string& ext) {
     EXPECT_TRUE(SetupEngineWithSendStream());
 
     // Ensure extensions are off by default.
     EXPECT_EQ(0u, GetSendStreamConfig(kSsrc1).rtp.extensions.size());
 
     // Ensure unknown extensions won't cause an error.
     send_parameters_.extensions.push_back(cricket::RtpHeaderExtension(
         "urn:ietf:params:unknownextention", 1));
     EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
@@ skipping 549 matching lines @@
   EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
   EXPECT_EQ(0, voe_.GetSendCodec(channel_num, codec));
   EXPECT_EQ(64000, codec.rate);
 
   send_parameters_.max_bandwidth_bps = 128;
   EXPECT_FALSE(channel_->SetSendParameters(send_parameters_));
   EXPECT_EQ(0, voe_.GetSendCodec(channel_num, codec));
   EXPECT_EQ(64000, codec.rate);
 }
 
+// Test that the per-stream bitrate limit and the global
+// bitrate limit both apply
+TEST_F(WebRtcVoiceEngineTestFake, SetMaxBitratePerStream) {
+  EXPECT_TRUE(SetupEngineWithSendStream());
+
+  // opus, default bitrate == 64000.
+  TestSendStreamBitrate(kOpusCodec, 0, 0, true, 64000);
+  TestSendStreamBitrate(kOpusCodec, 48000, 0, true, 48000);
+  TestSendStreamBitrate(kOpusCodec, 48000, 64000, true, 48000);
+  TestSendStreamBitrate(kOpusCodec, 64000, 48000, true, 48000);
+
+  // CBR codecs allow both maximums to exceed the bitrate
+  TestSendStreamBitrate(kPcmuCodec, 0, 0, true, 64000);
+  TestSendStreamBitrate(kPcmuCodec, 64001, 0, true, 64000);
+  TestSendStreamBitrate(kPcmuCodec, 0, 64001, true, 64000);
+  TestSendStreamBitrate(kPcmuCodec, 64001, 64001, true, 64000);
+
+  // CBR codecs don't allow per stream maximums to be too low
+  TestSendStreamBitrate(kPcmuCodec, 0, 63999, false, 64000);
+  TestSendStreamBitrate(kPcmuCodec, 64001, 63999, false, 64000);
+}
+
+TEST_F(WebRtcVoiceEngineTestFake, CannotSetMaxBitrateForNonexistentStream) {
+  EXPECT_TRUE(SetupEngine());
+  webrtc::RTCRtpParameters nonexistent_parameters =
+      channel_->GetRtpParameters(kSsrc1);
+  EXPECT_EQ(0, nonexistent_parameters.encodings.size());
+
+  nonexistent_parameters.encodings.push_back(
+      webrtc::RTCRtpEncodingParameters());
+  EXPECT_FALSE(channel_->SetRtpParameters(kSsrc1, nonexistent_parameters));
+}
+
+TEST_F(WebRtcVoiceEngineTestFake,
+       CannotSetRtpParametersWithIncorrectNumberOfEncodings) {

[Taylor Brandstetter, 2016/03/12 01:57:06]

If you add a TODO comment for the other "IncorrectNumberOfEncodings" test, add
it for this one too.

[skvlad, 2016/03/15 21:18:18]

Done.

+  EXPECT_TRUE(SetupEngineWithSendStream());
+  // no encodings - should fail
+  webrtc::RTCRtpParameters parameters;
+  EXPECT_FALSE(channel_->SetRtpParameters(kSsrc1, parameters));
+  // one encoding - expected to succeed
+  parameters.encodings.push_back(webrtc::RTCRtpEncodingParameters());
+  EXPECT_TRUE(channel_->SetRtpParameters(kSsrc1, parameters));
+  // two encodings - too many
+  parameters.encodings.push_back(webrtc::RTCRtpEncodingParameters());
+  EXPECT_FALSE(channel_->SetRtpParameters(kSsrc1, parameters));
+}
+
 // Test that we apply codecs properly.
 TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecs) {
   EXPECT_TRUE(SetupEngineWithSendStream());
   cricket::AudioSendParameters parameters;
   parameters.codecs.push_back(kIsacCodec);
   parameters.codecs.push_back(kPcmuCodec);
   parameters.codecs.push_back(kRedCodec);
   parameters.codecs[0].id = 96;
   parameters.codecs[0].bitrate = 48000;
   EXPECT_TRUE(channel_->SetSendParameters(parameters));
@@ skipping 2510 matching lines @@
   cricket::WebRtcVoiceEngine engine;
   EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
   std::unique_ptr<webrtc::Call> call(
       webrtc::Call::Create(webrtc::Call::Config()));
   cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::MediaConfig(),
                                            cricket::AudioOptions(), call.get());
   cricket::AudioRecvParameters parameters;
   parameters.codecs = engine.codecs();
   EXPECT_TRUE(channel.SetRecvParameters(parameters));
 }