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

(Auto)update libjingle 62281784-> 62293974

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5619 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-02-27 21:03:09 +00:00
parent 704bf9ebec
commit 806768a6ca
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

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

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