commit 0db023a70bd419e4a43317b6c9b0ecfa5184489e
author nisse <nisse@webrtc.org> Tue Mar 01 04:29:59 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Mar 01 12:30:07 2016 +0000
tree fa6745a803132b971786e4e6fd4731006bee1781
parent e496badf3cad31e18c926df259c74312183d41ab

Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

TBR=pthatcher@webrtc.org
BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1745003002

Cr-Commit-Position: refs/heads/master@{#11828}

webrtc/api/peerconnectioninterface_unittest.cc

diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc
index 701ab3c..8fad21e 100644
--- a/webrtc/api/peerconnectioninterface_unittest.cc
+++ b/webrtc/api/peerconnectioninterface_unittest.cc
@@ -2383,8 +2383,9 @@
       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
@@ -2411,7 +2412,7 @@
   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
@@ -2424,7 +2425,23 @@
   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
+// 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.