generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "(Auto)update libjingle 71675033-> 71726409"

Browse Source 
This reverts commit r6761 which looks like an accidental auto-revert of
r6760.

BUG=1788
TBR=wu@webrtc.org, henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18009004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6763 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-07-23 07:28:56 +00:00
parent 89c833cd9d
commit 5ff71ab4b3
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -665,6 +665,7 @@ void WebRtcVideoChannel2::Construct(webrtc::Call* call,
void WebRtcVideoChannel2::SetDefaultOptions() { void WebRtcVideoChannel2::SetDefaultOptions() {
options_.video_noise_reduction.Set(true); options_.video_noise_reduction.Set(true);
options_.use_payload_padding.Set(false); options_.use_payload_padding.Set(false);
options_.suspend_below_min_bitrate.Set(false);
} }
WebRtcVideoChannel2::~WebRtcVideoChannel2() { WebRtcVideoChannel2::~WebRtcVideoChannel2() {
@ -1518,6 +1519,9 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetCodecAndOptions(
parameters_.config.rtp.nack.rtp_history_ms = kNackHistoryMs; 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_.codec_settings.Set(codec_settings);
parameters_.options = options; parameters_.options = options;

20
talk/media/webrtc/webrtcvideoengine2_unittest.cc
View File

@ -1067,6 +1067,26 @@ TEST_F(WebRtcVideoChannel2Test,
FAIL() << "Not implemented."; // TODO(pbos): Implement. 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) { TEST_F(WebRtcVideoChannel2Test, RedundantPayloadsDisabledByDefault) {
const std::vector<uint32> ssrcs = MAKE_VECTOR(kSsrcs1); const std::vector<uint32> ssrcs = MAKE_VECTOR(kSsrcs1);
const std::vector<uint32> rtx_ssrcs = MAKE_VECTOR(kRtxSsrcs1); const std::vector<uint32> rtx_ssrcs = MAKE_VECTOR(kRtxSsrcs1);