From 806768a6ca82ed0a38ec95cc9c11531bc7d3f033 Mon Sep 17 00:00:00 2001
From: "henrike@webrtc.org"
 <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 27 Feb 2014 21:03:09 +0000
Subject: [PATCH] (Auto)update libjingle 62281784-> 62293974

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5619 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/media/webrtc/webrtcvideoengine.cc          |  8 +++++---
 talk/media/webrtc/webrtcvideoengine_unittest.cc | 14 ++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index 025ad9db33..06731c61e4 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -3148,9 +3148,11 @@ bool WebRtcVideoMediaChannel::CreateChannel(uint32 ssrc_key,
 
 bool WebRtcVideoMediaChannel::CreateUnsignalledRecvChannel(
     uint32 ssrc_key, int* out_channel_id) {
-  int unsignalled_recv_channel_limit =
-      options_.unsignalled_recv_stream_limit.GetWithDefaultIfUnset(
-          kNumDefaultUnsignalledVideoRecvStreams);
+  int unsignalled_recv_channel_limit = 0;
+  // TODO(tvsriram): Enable this once we fix handling packets
+  // in default channel with unsignalled recv.
+  //    options_.unsignalled_recv_stream_limit.GetWithDefaultIfUnset(
+  //        kNumDefaultUnsignalledVideoRecvStreams);
   if (num_unsignalled_recv_channels_ >= unsignalled_recv_channel_limit) {
     return false;
   }
diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc
index 9d655b3db6..d00fb2de38 100644
--- a/talk/media/webrtc/webrtcvideoengine_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc
@@ -2095,24 +2095,30 @@ TEST_F(WebRtcVideoMediaChannelTest, TwoStreamsReUseFirstStream) {
                                                        0));
 }
 
-TEST_F(WebRtcVideoMediaChannelTest, TwoStreamsSendAndUnsignalledRecv) {
+// TODO(tvsriram): Fix these tests with unsignalled recv before adding again.
+TEST_F(WebRtcVideoMediaChannelTest, DISABLED_TwoStreamsSendAndUnsignalledRecv) {
   Base::TwoStreamsSendAndUnsignalledRecv(cricket::VideoCodec(100, "VP8", 640,
                                                              400, 30, 0));
 }
 
-TEST_F(WebRtcVideoMediaChannelTest, TwoStreamsSendAndFailUnsignalledRecv) {
+// TODO(tvsriram): Fix these tests with unsignalled recv before adding again.
+TEST_F(WebRtcVideoMediaChannelTest,
+       DISABLED_TwoStreamsSendAndFailUnsignalledRecv) {
+  webrtc::Trace::set_level_filter(webrtc::kTraceAll);
   Base::TwoStreamsSendAndFailUnsignalledRecv(
       cricket::VideoCodec(100, "VP8", 640, 400, 30, 0));
 }
 
+// TODO(tvsriram): Fix these tests with unsignalled recv before adding again.
 TEST_F(WebRtcVideoMediaChannelTest,
-       TwoStreamsSendAndFailUnsignalledRecvInOneToOne) {
+       DISABLED_TwoStreamsSendAndFailUnsignalledRecvInOneToOne) {
   Base::TwoStreamsSendAndFailUnsignalledRecvInOneToOne(
       cricket::VideoCodec(100, "VP8", 640, 400, 30, 0));
 }
 
+// TODO(tvsriram): Fix these tests with unsignalled recv before adding again.
 TEST_F(WebRtcVideoMediaChannelTest,
-       TwoStreamsAddAndRemoveUnsignalledRecv) {
+       DISABLED_TwoStreamsAddAndRemoveUnsignalledRecv) {
   Base::TwoStreamsAddAndRemoveUnsignalledRecv(cricket::VideoCodec(100, "VP8",
                                                                   640, 400, 30,
                                                                   0));