Updated structures and functions for setting the max bitrate limit to take rtc::Optional<int>

webrtc/pc/channel_unittest.cc

 /*
  *  Copyright 2009 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 1831 matching lines @@
     EXPECT_FALSE(media_channel1_->ready_to_send());
   }
 
   bool SetRemoteContentWithBitrateLimit(int remote_limit) {
     typename T::Content content;
     CreateContent(0, kPcmuCodec, kH264Codec, &content);
     content.set_bandwidth(remote_limit);
     return channel1_->SetRemoteContent(&content, CA_OFFER, NULL);
   }
 
-  webrtc::RtpParameters BitrateLimitedParameters(int limit) {
+  webrtc::RtpParameters BitrateLimitedParameters(rtc::Optional<int> limit) {
     webrtc::RtpParameters parameters;
     webrtc::RtpEncodingParameters encoding;
     encoding.max_bitrate_bps = limit;
     parameters.encodings.push_back(encoding);
     return parameters;
   }
 
   void VerifyMaxBitrate(const webrtc::RtpParameters& parameters,
-                        int expected_bitrate) {
+                        rtc::Optional<int> expected_bitrate) {
     EXPECT_EQ(1UL, parameters.encodings.size());
     EXPECT_EQ(expected_bitrate, parameters.encodings[0].max_bitrate_bps);
   }
 
   void DefaultMaxBitrateIsUnlimited() {
     CreateChannels(0, 0);
     EXPECT_TRUE(
         channel1_->SetLocalContent(&local_media_content1_, CA_OFFER, NULL));
-    EXPECT_EQ(media_channel1_->max_bps(), -1);
-    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1), -1);
+    EXPECT_EQ(rtc::Optional<int>(), media_channel1_->max_bps());
+    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>());
   }
 
   void CanChangeMaxBitrate() {
     CreateChannels(0, 0);
     EXPECT_TRUE(
         channel1_->SetLocalContent(&local_media_content1_, CA_OFFER, NULL));
 
-    EXPECT_TRUE(
-        channel1_->SetRtpParameters(kSsrc1, BitrateLimitedParameters(1000)));
-    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1), 1000);
-    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1), 1000);
-    EXPECT_EQ(-1, media_channel1_->max_bps());
+    EXPECT_TRUE(channel1_->SetRtpParameters(
+        kSsrc1, BitrateLimitedParameters(rtc::Optional<int>(1000))));
+    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>(1000));
+    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>(1000));
+    EXPECT_EQ(rtc::Optional<int>(), media_channel1_->max_bps());
 
-    EXPECT_TRUE(
-        channel1_->SetRtpParameters(kSsrc1, BitrateLimitedParameters(-1)));
-    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1), -1);
-    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1), -1);
-    EXPECT_EQ(-1, media_channel1_->max_bps());
+    EXPECT_TRUE(channel1_->SetRtpParameters(
+        kSsrc1, BitrateLimitedParameters(rtc::Optional<int>())));
+    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1), rtc::Optional<int>());
+    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>());
+    EXPECT_EQ(rtc::Optional<int>(), media_channel1_->max_bps());
   }
 
  protected:
   // TODO(pbos): Remove playout from all media channels and let renderers mute
   // themselves.
   const bool verify_playout_;
   cricket::FakeTransportController transport_controller1_;
   cricket::FakeTransportController transport_controller2_;
   cricket::FakeMediaEngine media_engine_;
   // The media channels are owned by the voice channel objects below.
@@ skipping 462 matching lines @@
   EXPECT_TRUE(
       channel1_->SetLocalContent(&local_media_content1_, CA_OFFER, NULL));
   webrtc::RtpParameters voice_parameters = channel1_->GetRtpParameters(kSsrc1);
   EXPECT_EQ(0UL, voice_parameters.encodings.size());
 }
 
 TEST_F(VoiceChannelTest, SetRtpParametersIsNotImplemented) {
   CreateChannels(0, 0);
   EXPECT_TRUE(
       channel1_->SetLocalContent(&local_media_content1_, CA_OFFER, NULL));
-  EXPECT_FALSE(
-      channel1_->SetRtpParameters(kSsrc1, BitrateLimitedParameters(1000)));
+  EXPECT_FALSE(channel1_->SetRtpParameters(
+      kSsrc1, BitrateLimitedParameters(rtc::Optional<int>(1000))));
 }
 
 // VideoChannelTest
 TEST_F(VideoChannelTest, TestInit) {
   Base::TestInit();
 }
 
 TEST_F(VideoChannelTest, TestSetContents) {
   Base::TestSetContents();
 }
@@ skipping 434 matching lines @@
   };
   rtc::CopyOnWriteBuffer payload(data, 3);
   cricket::SendDataResult result;
   ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
   EXPECT_EQ(params.ssrc,
             media_channel1_->last_sent_data_params().ssrc);
   EXPECT_EQ("foo", media_channel1_->last_sent_data());
 }
 
 // TODO(pthatcher): TestSetReceiver?