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));