Set max bitrate for audio send stream based on RtpParameters.

webrtc/media/engine/webrtcvoiceengine_unittest.cc

Index: webrtc/media/engine/webrtcvoiceengine_unittest.cc
diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
index 2d41ecd43b513a4c620bd1c41ea9bd4dfd0bb55e..959a70d2f080b6b1c81f00a556a8d85d88d9ae13 100644
--- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc
+++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
@@ -1212,6 +1212,59 @@ TEST_F(WebRtcVoiceEngineTestFake, SetAndGetRtpSendParameters) {
   EXPECT_EQ(initial_params, channel_->GetRtpSendParameters(kSsrcX));
 }
 
+// Test that max_bitrate_bps in send stream config gets updated correctly when
+// SetRtpSendParameters is called

[the sun, 2017/03/27 15:34:21]

nit: trailing "."

[minyue-webrtc, 2017/03/27 17:51:24]

Done.

+TEST_F(WebRtcVoiceEngineTestFake, SetRtpSendParameterUpdatesMaxBitrate) {
+  webrtc::test::ScopedFieldTrials override_field_trials(
+      "WebRTC-Audio-SendSideBwe/Enabled/");
+  EXPECT_TRUE(SetupSendStream());
+  cricket::AudioSendParameters send_parameters;
+  send_parameters.codecs.push_back(kOpusCodec);
+  SetSendParameters(send_parameters);
+
+  webrtc::RtpParameters rtp_parameters = channel_->GetRtpSendParameters(kSsrcX);
+  // Expect emptu on parameters.encodings[0].max_bitrate_bps;

[the sun, 2017/03/27 15:34:21]

emptu -> empty

[minyue-webrtc, 2017/03/27 17:51:24]

oh, thanks. I hate my ide that give a bad color on comments. I will change the
color theme.

+  EXPECT_FALSE(rtp_parameters.encodings[0].max_bitrate_bps);
+
+  constexpr int kMaxBitrateBps = 6000;
+  rtp_parameters.encodings[0].max_bitrate_bps =
+      rtc::Optional<int>(kMaxBitrateBps);
+  EXPECT_TRUE(channel_->SetRtpSendParameters(kSsrcX, rtp_parameters));
+
+  const int max_bitrate = GetSendStreamConfig(kSsrcX).max_bitrate_bps;
+  EXPECT_EQ(max_bitrate, kMaxBitrateBps);
+}
+
+// This test is similar to SetRtpSendParameterUpdatesMaxBitrate but with an
+// additional field trial.
+TEST_F(WebRtcVoiceEngineTestFake,
+       SetRtpSendParameterUpdatesMaxBitrateWithOverhead) {
+  webrtc::test::ScopedFieldTrials override_field_trials(
+      "WebRTC-Audio-SendSideBwe/Enabled/WebRTC-SendSideBwe-WithOverhead/"

[the sun, 2017/03/27 15:34:21]

is "/" really separator between trials?

nit: split on two lines after "Enabled/" instead - easier to read.

[minyue-webrtc, 2017/03/27 17:51:24]

"/" is 

On 2017/03/27 15:34:21, the sun wrote:
sure

+      "Enabled/");
+  EXPECT_TRUE(SetupSendStream());
+  cricket::AudioSendParameters send_parameters;
+  send_parameters.codecs.push_back(kOpusCodec);
+  SetSendParameters(send_parameters);
+
+  webrtc::RtpParameters rtp_parameters = channel_->GetRtpSendParameters(kSsrcX);
+  // Expect emptu on parameters.encodings[0].max_bitrate_bps;

[the sun, 2017/03/27 15:34:21]

emptu->empty

[minyue-webrtc, 2017/03/27 17:51:24]

Done.

+  EXPECT_FALSE(rtp_parameters.encodings[0].max_bitrate_bps);
+
+  constexpr int kMaxBitrateBps = 6000;
+  rtp_parameters.encodings[0].max_bitrate_bps =
+      rtc::Optional<int>(kMaxBitrateBps);
+  EXPECT_TRUE(channel_->SetRtpSendParameters(kSsrcX, rtp_parameters));
+
+  const int max_bitrate = GetSendStreamConfig(kSsrcX).max_bitrate_bps;
+#if WEBRTC_OPUS_SUPPORT_120MS_PTIME
+  constexpr int kMinOverhead = 3333;
+#else
+  constexpr int kMinOverhead = 6666;
+#endif
+  EXPECT_EQ(max_bitrate, kMaxBitrateBps + kMinOverhead);
+}
+
 // Test that GetRtpReceiveParameters returns the currently configured codecs.
 TEST_F(WebRtcVoiceEngineTestFake, GetRtpReceiveParametersCodecs) {
   EXPECT_TRUE(SetupRecvStream());