From f67f6aa74187dbb804ec3bc98b9551db9fcf5571 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Wed, 23 Jul 2014 07:04:22 +0000 Subject: [PATCH] (Auto)update libjingle 71675033-> 71726409 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6761 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine2.cc | 4 ---- .../webrtc/webrtcvideoengine2_unittest.cc | 20 ------------------- 2 files changed, 24 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 28bd6f46a..549aa2cfe 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -665,7 +665,6 @@ void WebRtcVideoChannel2::Construct(webrtc::Call* call, 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 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetCodecAndOptions( parameters_.config.rtp.nack.rtp_history_ms = kNackHistoryMs; } - options.suspend_below_min_bitrate.Get( - ¶meters_.config.suspend_below_min_bitrate); - parameters_.codec_settings.Set(codec_settings); parameters_.options = options; diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc index c6168ea16..c9d2066e0 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc @@ -1067,26 +1067,6 @@ TEST_F(WebRtcVideoChannel2Test, 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 ssrcs = MAKE_VECTOR(kSsrcs1); const std::vector rtx_ssrcs = MAKE_VECTOR(kRtxSsrcs1);