Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

webrtc/api/peerconnectioninterface_unittest.cc

 /*
  *  Copyright 2012 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 2365 matching lines @@
 // This test verifies the default behaviour with no constraints and a
 // default RTCConfiguration.
 TEST_F(PeerConnectionMediaConfigTest, TestDefaults) {
   PeerConnectionInterface::RTCConfiguration config;
   FakeConstraints constraints;
 
   const cricket::MediaConfig& media_config =
       TestCreatePeerConnection(config, &constraints);
 
   EXPECT_FALSE(media_config.enable_dscp);
-  EXPECT_TRUE(media_config.enable_cpu_overuse_detection);
-  EXPECT_FALSE(media_config.disable_prerenderer_smoothing);
+  EXPECT_TRUE(media_config.video.enable_cpu_overuse_detection);
+  EXPECT_FALSE(media_config.video.disable_prerenderer_smoothing);
+  EXPECT_FALSE(media_config.video.suspend_below_min_bitrate);
 }
 
 // This test verifies the DSCP constraint is recognized and passed to
 // the CreateMediaController call.
 TEST_F(PeerConnectionMediaConfigTest, TestDscpConstraintTrue) {
   PeerConnectionInterface::RTCConfiguration config;
   FakeConstraints constraints;
 
   constraints.AddOptional(webrtc::MediaConstraintsInterface::kEnableDscp, true);
   const cricket::MediaConfig& media_config =
       TestCreatePeerConnection(config, &constraints);
 
   EXPECT_TRUE(media_config.enable_dscp);
 }
 
 // This test verifies the cpu overuse detection constraint is
 // recognized and passed to the CreateMediaController call.
 TEST_F(PeerConnectionMediaConfigTest, TestCpuOveruseConstraintFalse) {
   PeerConnectionInterface::RTCConfiguration config;
   FakeConstraints constraints;
 
   constraints.AddOptional(
       webrtc::MediaConstraintsInterface::kCpuOveruseDetection, false);
   const cricket::MediaConfig media_config =
       TestCreatePeerConnection(config, &constraints);
 
-  EXPECT_FALSE(media_config.enable_cpu_overuse_detection);
+  EXPECT_FALSE(media_config.video.enable_cpu_overuse_detection);
 }
 
 // This test verifies that the disable_prerenderer_smoothing flag is
 // propagated from RTCConfiguration to the CreateMediaController call.
 TEST_F(PeerConnectionMediaConfigTest, TestDisablePrerendererSmoothingTrue) {
   PeerConnectionInterface::RTCConfiguration config;
   FakeConstraints constraints;
 
   config.disable_prerenderer_smoothing = true;
   const cricket::MediaConfig& media_config =
       TestCreatePeerConnection(config, &constraints);
 
-  EXPECT_TRUE(media_config.disable_prerenderer_smoothing);
+  EXPECT_TRUE(media_config.video.disable_prerenderer_smoothing);
+}
+
+// This test verifies the suspend below min bitrate constraint is

[pbos-webrtc, 2016/02/29 13:20:31]

Verify false/default values as well.

[nisse-webrtc, 2016/02/29 15:01:07]

There's a TestDefaults testcase above.

+// recognized and passed to the CreateMediaController call.
+TEST_F(PeerConnectionMediaConfigTest,
+       TestSuspendBelowMinBitrateConstraintTrue) {
+  PeerConnectionInterface::RTCConfiguration config;
+  FakeConstraints constraints;
+
+  constraints.AddOptional(
+      webrtc::MediaConstraintsInterface::kEnableVideoSuspendBelowMinBitrate,
+      true);
+  const cricket::MediaConfig media_config =
+      TestCreatePeerConnection(config, &constraints);
+
+  EXPECT_TRUE(media_config.video.suspend_below_min_bitrate);
 }
 
 // The following tests verify that session options are created correctly.
 // TODO(deadbeef): Convert these tests to be more end-to-end. Instead of
 // "verify options are converted correctly", should be "pass options into
 // CreateOffer and verify the correct offer is produced."
 
 TEST(CreateSessionOptionsTest, GetOptionsForOfferWithInvalidAudioOption) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_audio = RTCOfferAnswerOptions::kUndefined - 1;
@@ skipping 151 matching lines @@
   FakeConstraints updated_answer_c;
   answer_c.SetMandatoryReceiveAudio(false);
   answer_c.SetMandatoryReceiveVideo(false);
 
   cricket::MediaSessionOptions updated_answer_options;
   EXPECT_TRUE(
       ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
   EXPECT_TRUE(updated_answer_options.has_audio());
   EXPECT_TRUE(updated_answer_options.has_video());
 }