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

(Auto)update libjingle 78642371-> 78680406

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7545 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-10-28 17:37:17 +00:00
parent a296725d0e
commit ae694effd8
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
talk/media/base/videoengine_unittest.h
View File

@ -783,10 +783,7 @@ class VideoMediaChannelTest : public testing::Test,
void SetSendSetsTransportBufferSizes() { void SetSendSetsTransportBufferSizes() {
EXPECT_TRUE(SetOneCodec(DefaultCodec())); EXPECT_TRUE(SetOneCodec(DefaultCodec()));
EXPECT_TRUE(SetSend(true)); EXPECT_TRUE(SetSend(true));
// TODO(sriniv): Remove or re-enable this. EXPECT_EQ(64 * 1024, network_interface_.sendbuf_size());
// 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_.recvbuf_size()); EXPECT_EQ(64 * 1024, network_interface_.recvbuf_size());
} }
// Tests that we can send frames and the right payload type is used. // Tests that we can send frames and the right payload type is used.

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

@ -3109,12 +3109,13 @@ void WebRtcVideoMediaChannel::SetInterface(NetworkInterface* iface) {
rtc::Socket::OPT_RCVBUF, rtc::Socket::OPT_RCVBUF,
kVideoRtpBufferSize); kVideoRtpBufferSize);
// TODO(sriniv): Remove or re-enable this. // Speculative change to increase the outbound socket buffer size.
// As part of b/8030474, send-buffer is size now controlled through // In b/15152257, we are seeing a significant number of packets discarded
// portallocator flags. // due to lack of socket buffer space, although it's not yet clear what the
// network_interface_->SetOption(NetworkInterface::ST_RTP, // ideal value should be.
// rtc::Socket::OPT_SNDBUF, MediaChannel::SetOption(NetworkInterface::ST_RTP,
// kVideoRtpBufferSize); rtc::Socket::OPT_SNDBUF,
kVideoRtpBufferSize);
} }
void WebRtcVideoMediaChannel::UpdateAspectRatio(int ratio_w, int ratio_h) { void WebRtcVideoMediaChannel::UpdateAspectRatio(int ratio_w, int ratio_h) {

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

@ -1294,12 +1294,13 @@ void WebRtcVideoChannel2::SetInterface(NetworkInterface* iface) {
rtc::Socket::OPT_RCVBUF, rtc::Socket::OPT_RCVBUF,
kVideoRtpBufferSize); kVideoRtpBufferSize);
// TODO(sriniv): Remove or re-enable this. // Speculative change to increase the outbound socket buffer size.
// As part of b/8030474, send-buffer is size now controlled through // In b/15152257, we are seeing a significant number of packets discarded
// portallocator flags. // due to lack of socket buffer space, although it's not yet clear what the
// network_interface_->SetOption(NetworkInterface::ST_RTP, // ideal value should be.
// rtc::Socket::OPT_SNDBUF, MediaChannel::SetOption(NetworkInterface::ST_RTP,
// kVideoRtpBufferSize); rtc::Socket::OPT_SNDBUF,
kVideoRtpBufferSize);
} }
void WebRtcVideoChannel2::UpdateAspectRatio(int ratio_w, int ratio_h) { void WebRtcVideoChannel2::UpdateAspectRatio(int ratio_w, int ratio_h) {