From ae694effd85d501f15600275dec96522a00c4feb Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Tue, 28 Oct 2014 17:37:17 +0000 Subject: [PATCH] (Auto)update libjingle 78642371-> 78680406 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7545 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/base/videoengine_unittest.h | 5 +---- talk/media/webrtc/webrtcvideoengine.cc | 13 +++++++------ talk/media/webrtc/webrtcvideoengine2.cc | 13 +++++++------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h index 6ea5b8cff..343207603 100644 --- a/talk/media/base/videoengine_unittest.h +++ b/talk/media/base/videoengine_unittest.h @@ -783,10 +783,7 @@ class VideoMediaChannelTest : public testing::Test, void SetSendSetsTransportBufferSizes() { EXPECT_TRUE(SetOneCodec(DefaultCodec())); EXPECT_TRUE(SetSend(true)); - // TODO(sriniv): Remove or re-enable this. - // As part of b/8030474, send-buffer is size now controlled through - // portallocator flags. Its not set by channels. - // EXPECT_EQ(64 * 1024, network_interface_.sendbuf_size()); + EXPECT_EQ(64 * 1024, network_interface_.sendbuf_size()); EXPECT_EQ(64 * 1024, network_interface_.recvbuf_size()); } // Tests that we can send frames and the right payload type is used. diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 064c005a3..12cd90730 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -3109,12 +3109,13 @@ void WebRtcVideoMediaChannel::SetInterface(NetworkInterface* iface) { rtc::Socket::OPT_RCVBUF, kVideoRtpBufferSize); - // TODO(sriniv): Remove or re-enable this. - // As part of b/8030474, send-buffer is size now controlled through - // portallocator flags. - // network_interface_->SetOption(NetworkInterface::ST_RTP, - // rtc::Socket::OPT_SNDBUF, - // kVideoRtpBufferSize); + // Speculative change to increase the outbound socket buffer size. + // In b/15152257, we are seeing a significant number of packets discarded + // due to lack of socket buffer space, although it's not yet clear what the + // ideal value should be. + MediaChannel::SetOption(NetworkInterface::ST_RTP, + rtc::Socket::OPT_SNDBUF, + kVideoRtpBufferSize); } void WebRtcVideoMediaChannel::UpdateAspectRatio(int ratio_w, int ratio_h) { diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 19f2b8d1a..5783f5bb9 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -1294,12 +1294,13 @@ void WebRtcVideoChannel2::SetInterface(NetworkInterface* iface) { rtc::Socket::OPT_RCVBUF, kVideoRtpBufferSize); - // TODO(sriniv): Remove or re-enable this. - // As part of b/8030474, send-buffer is size now controlled through - // portallocator flags. - // network_interface_->SetOption(NetworkInterface::ST_RTP, - // rtc::Socket::OPT_SNDBUF, - // kVideoRtpBufferSize); + // Speculative change to increase the outbound socket buffer size. + // In b/15152257, we are seeing a significant number of packets discarded + // due to lack of socket buffer space, although it's not yet clear what the + // ideal value should be. + MediaChannel::SetOption(NetworkInterface::ST_RTP, + rtc::Socket::OPT_SNDBUF, + kVideoRtpBufferSize); } void WebRtcVideoChannel2::UpdateAspectRatio(int ratio_w, int ratio_h) {