zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Auto)update libjingle 69097619-> 69099564

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6419 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-06-12 21:36:26 +00:00
parent 6c6f33b5bb
commit 3f3f428d2b
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -3027,13 +3027,10 @@ bool WebRtcVideoMediaChannel::SetOptions(const VideoOptions &options) {
if (leaky_bucket_changed) { if (leaky_bucket_changed) {
bool enable_leaky_bucket = bool enable_leaky_bucket =
options_.video_leaky_bucket.GetWithDefaultIfUnset(true); options_.video_leaky_bucket.GetWithDefaultIfUnset(false);
LOG(LS_INFO) << "Leaky bucket is enabled? " << enable_leaky_bucket; LOG(LS_INFO) << "Leaky bucket is enabled? " << enable_leaky_bucket;
for (SendChannelMap::iterator it = send_channels_.begin(); for (SendChannelMap::iterator it = send_channels_.begin();
it != send_channels_.end(); ++it) { it != send_channels_.end(); ++it) {
// TODO(holmer): This API will be removed as we move to the new
// webrtc::Call API. We should clean up this experiment when that is
// happening.
if (engine()->vie()->rtp()->SetTransmissionSmoothingStatus( if (engine()->vie()->rtp()->SetTransmissionSmoothingStatus(
it->second->channel_id(), enable_leaky_bucket) != 0) { it->second->channel_id(), enable_leaky_bucket) != 0) {
LOG_RTCERR2(SetTransmissionSmoothingStatus, it->second->channel_id(), LOG_RTCERR2(SetTransmissionSmoothingStatus, it->second->channel_id(),
@ -3576,7 +3573,7 @@ bool WebRtcVideoMediaChannel::ConfigureSending(int channel_id,
return false; return false;
} }
if (options_.video_leaky_bucket.GetWithDefaultIfUnset(true)) { if (options_.video_leaky_bucket.GetWithDefaultIfUnset(false)) {
if (engine()->vie()->rtp()->SetTransmissionSmoothingStatus(channel_id, if (engine()->vie()->rtp()->SetTransmissionSmoothingStatus(channel_id,
true) != 0) { true) != 0) {
LOG_RTCERR2(SetTransmissionSmoothingStatus, channel_id, true); LOG_RTCERR2(SetTransmissionSmoothingStatus, channel_id, true);
@ -3968,7 +3965,7 @@ bool WebRtcVideoMediaChannel::MaybeResetVieSendCodec(
options_.video_noise_reduction.GetWithDefaultIfUnset(false); options_.video_noise_reduction.GetWithDefaultIfUnset(false);
int screencast_min_bitrate = int screencast_min_bitrate =
options_.screencast_min_bitrate.GetWithDefaultIfUnset(0); options_.screencast_min_bitrate.GetWithDefaultIfUnset(0);
bool leaky_bucket = options_.video_leaky_bucket.GetWithDefaultIfUnset(true); bool leaky_bucket = options_.video_leaky_bucket.GetWithDefaultIfUnset(false);
bool denoising = !is_screencast && enable_denoising; bool denoising = !is_screencast && enable_denoising;
bool reset_send_codec = bool reset_send_codec =
target_width != cur_width || target_height != cur_height || target_width != cur_width || target_height != cur_height ||

26
talk/media/webrtc/webrtcvideoengine_unittest.cc
View File

@ -959,17 +959,17 @@ TEST_F(WebRtcVideoEngineTestFake, RecvAbsoluteSendTimeHeaderExtensions) {
TEST_F(WebRtcVideoEngineTestFake, LeakyBucketTest) { TEST_F(WebRtcVideoEngineTestFake, LeakyBucketTest) {
EXPECT_TRUE(SetupEngine()); EXPECT_TRUE(SetupEngine());
// Verify this is on by default. // Verify this is off by default.
EXPECT_TRUE(channel_->AddSendStream(cricket::StreamParams::CreateLegacy(1))); EXPECT_TRUE(channel_->AddSendStream(cricket::StreamParams::CreateLegacy(1)));
int first_send_channel = vie_.GetLastChannel(); int first_send_channel = vie_.GetLastChannel();
EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(first_send_channel)); EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(first_send_channel));
// Disable the experiment and verify. // Enable the experiment and verify.
cricket::VideoOptions options; cricket::VideoOptions options;
options.conference_mode.Set(true); options.conference_mode.Set(true);
options.video_leaky_bucket.Set(false); options.video_leaky_bucket.Set(true);
EXPECT_TRUE(channel_->SetOptions(options)); EXPECT_TRUE(channel_->SetOptions(options));
EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(first_send_channel)); EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(first_send_channel));
// Add a receive channel and verify leaky bucket isn't enabled. // Add a receive channel and verify leaky bucket isn't enabled.
EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(2))); EXPECT_TRUE(channel_->AddRecvStream(cricket::StreamParams::CreateLegacy(2)));
@ -977,16 +977,10 @@ TEST_F(WebRtcVideoEngineTestFake, LeakyBucketTest) {
EXPECT_NE(first_send_channel, recv_channel_num); EXPECT_NE(first_send_channel, recv_channel_num);
EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(recv_channel_num)); EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(recv_channel_num));
// Add a new send stream and verify leaky bucket is disabled from start. // Add a new send stream and verify leaky bucket is enabled from start.
EXPECT_TRUE(channel_->AddSendStream(cricket::StreamParams::CreateLegacy(3))); EXPECT_TRUE(channel_->AddSendStream(cricket::StreamParams::CreateLegacy(3)));
int second_send_channel = vie_.GetLastChannel(); int second_send_channel = vie_.GetLastChannel();
EXPECT_NE(first_send_channel, second_send_channel); EXPECT_NE(first_send_channel, second_send_channel);
EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(second_send_channel));
// Reenable leaky bucket.
options.video_leaky_bucket.Set(true);
EXPECT_TRUE(channel_->SetOptions(options));
EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(first_send_channel));
EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(second_send_channel)); EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(second_send_channel));
} }
@ -1068,12 +1062,12 @@ TEST_F(WebRtcVideoEngineTestFake, AdditiveVideoOptions) {
EXPECT_TRUE(channel_->SetOptions(options1)); EXPECT_TRUE(channel_->SetOptions(options1));
EXPECT_EQ(100, vie_.GetSenderTargetDelay(first_send_channel)); EXPECT_EQ(100, vie_.GetSenderTargetDelay(first_send_channel));
EXPECT_EQ(100, vie_.GetReceiverTargetDelay(first_send_channel)); EXPECT_EQ(100, vie_.GetReceiverTargetDelay(first_send_channel));
EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(first_send_channel)); EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(first_send_channel));
cricket::VideoOptions options2; cricket::VideoOptions options2;
options2.video_leaky_bucket.Set(false); options2.video_leaky_bucket.Set(true);
EXPECT_TRUE(channel_->SetOptions(options2)); EXPECT_TRUE(channel_->SetOptions(options2));
EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(first_send_channel)); EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(first_send_channel));
// The buffered_mode_latency still takes effect. // The buffered_mode_latency still takes effect.
EXPECT_EQ(100, vie_.GetSenderTargetDelay(first_send_channel)); EXPECT_EQ(100, vie_.GetSenderTargetDelay(first_send_channel));
EXPECT_EQ(100, vie_.GetReceiverTargetDelay(first_send_channel)); EXPECT_EQ(100, vie_.GetReceiverTargetDelay(first_send_channel));
@ -1083,7 +1077,7 @@ TEST_F(WebRtcVideoEngineTestFake, AdditiveVideoOptions) {
EXPECT_EQ(50, vie_.GetSenderTargetDelay(first_send_channel)); EXPECT_EQ(50, vie_.GetSenderTargetDelay(first_send_channel));
EXPECT_EQ(50, vie_.GetReceiverTargetDelay(first_send_channel)); EXPECT_EQ(50, vie_.GetReceiverTargetDelay(first_send_channel));
// The video_leaky_bucket still takes effect. // The video_leaky_bucket still takes effect.
EXPECT_FALSE(vie_.GetTransmissionSmoothingStatus(first_send_channel)); EXPECT_TRUE(vie_.GetTransmissionSmoothingStatus(first_send_channel));
} }
TEST_F(WebRtcVideoEngineTestFake, SetCpuOveruseOptionsWithCaptureJitterMethod) { TEST_F(WebRtcVideoEngineTestFake, SetCpuOveruseOptionsWithCaptureJitterMethod) {