commit be28fe45b6a738309cfb071c8cd3a1a80bc7ec0c
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jul 23 07:04:22 2014 +0000
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jul 23 07:04:22 2014 +0000
tree 3f9a69ec961fdc7efbdf37d46da887b1c315f183
parent 48f113fcfd6236f6f5512183151a208856f34685

(Auto)update libjingle 71675033-> 71726409

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6761 4adac7df-926f-26a2-2b94-8c16560cd09d

media/webrtc/webrtcvideoengine2.cc

diff --git a/media/webrtc/webrtcvideoengine2.cc b/media/webrtc/webrtcvideoengine2.cc
index 28bd6f4..549aa2c 100644
--- a/media/webrtc/webrtcvideoengine2.cc
+++ b/media/webrtc/webrtcvideoengine2.cc
@@ -665,7 +665,6 @@
 void WebRtcVideoChannel2::SetDefaultOptions() {
   options_.video_noise_reduction.Set(true);
   options_.use_payload_padding.Set(false);
-  options_.suspend_below_min_bitrate.Set(false);
 }
 
 WebRtcVideoChannel2::~WebRtcVideoChannel2() {
@@ -1519,9 +1518,6 @@
     parameters_.config.rtp.nack.rtp_history_ms = kNackHistoryMs;
   }
 
-  options.suspend_below_min_bitrate.Get(
-      &parameters_.config.suspend_below_min_bitrate);
-
   parameters_.codec_settings.Set(codec_settings);
   parameters_.options = options;
 

media/webrtc/webrtcvideoengine2_unittest.cc

diff --git a/media/webrtc/webrtcvideoengine2_unittest.cc b/media/webrtc/webrtcvideoengine2_unittest.cc
index c6168ea..c9d2066 100644
--- a/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -1067,26 +1067,6 @@
   FAIL() << "Not implemented.";  // TODO(pbos): Implement.
 }
 
-TEST_F(WebRtcVideoChannel2Test, SuspendBelowMinBitrateDisabledByDefault) {
-  FakeVideoSendStream* stream = AddSendStream();
-  EXPECT_FALSE(stream->GetConfig().suspend_below_min_bitrate);
-}
-
-TEST_F(WebRtcVideoChannel2Test, SetOptionsWithSuspendBelowMinBitrate) {
-  VideoOptions options;
-  options.suspend_below_min_bitrate.Set(true);
-  channel_->SetOptions(options);
-
-  FakeVideoSendStream* stream = AddSendStream();
-  EXPECT_TRUE(stream->GetConfig().suspend_below_min_bitrate);
-
-  options.suspend_below_min_bitrate.Set(false);
-  channel_->SetOptions(options);
-
-  stream = fake_channel_->GetFakeCall()->GetVideoSendStreams()[0];
-  EXPECT_FALSE(stream->GetConfig().suspend_below_min_bitrate);
-}
-
 TEST_F(WebRtcVideoChannel2Test, RedundantPayloadsDisabledByDefault) {
   const std::vector<uint32> ssrcs = MAKE_VECTOR(kSsrcs1);
   const std::vector<uint32> rtx_ssrcs = MAKE_VECTOR(kRtxSsrcs1);