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

Implement and fix new-API NackIsEnabled test.

Browse Source 
Required enabling NACK on receiver side which was apparently missed.

BUG=1788
R=pthatcher@google.com, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/16499007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6278 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2014-05-30 07:35:47 +00:00
parent 1d66be22c8
commit 198647473b
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1011,6 +1011,7 @@ bool WebRtcVideoChannel2::AddRecvStream(const StreamParams& sp) {
config.rtp.rtx[0].ssrc = rtx_ssrc; config.rtp.rtx[0].ssrc = rtx_ssrc;
} }
config.rtp.nack.rtp_history_ms = kNackHistoryMs;
config.rtp.remb = true; config.rtp.remb = true;
// TODO(pbos): This protection is against setting the same local ssrc as // TODO(pbos): This protection is against setting the same local ssrc as
// remote which is not permitted by the lower-level API. RTCP requires a // remote which is not permitted by the lower-level API. RTCP requires a

20
talk/media/webrtc/webrtcvideoengine2_unittest.cc
View File

@@ -687,9 +687,23 @@ TEST_F(WebRtcVideoChannel2Test, DISABLED_RembOnOff) {
FAIL() << "Not implemented."; // TODO(pbos): Implement. FAIL() << "Not implemented."; // TODO(pbos): Implement.
} }
TEST_F(WebRtcVideoChannel2Test, DISABLED_NackEnabled) { TEST_F(WebRtcVideoChannel2Test, NackIsEnabled) {
// Verify NACK on both sender and receiver. EXPECT_TRUE(channel_->SetSendCodecs(engine_.codecs()));
FAIL() << "Not implemented."; // TODO(pbos): Implement. EXPECT_TRUE(channel_->SetSend(true));
// Send side.
FakeVideoSendStream* send_stream =
AddSendStream(cricket::StreamParams::CreateLegacy(1));
EXPECT_GT(send_stream->GetConfig().rtp.nack.rtp_history_ms, 0);
// Receiver side.
FakeVideoReceiveStream* recv_stream =
AddRecvStream(cricket::StreamParams::CreateLegacy(1));
EXPECT_GT(recv_stream->GetConfig().rtp.nack.rtp_history_ms, 0);
// Nack history size should match between sender and receiver.
EXPECT_EQ(send_stream->GetConfig().rtp.nack.rtp_history_ms,
recv_stream->GetConfig().rtp.nack.rtp_history_ms);
} }
TEST_F(WebRtcVideoChannel2Test, DISABLED_VideoProtectionInterop) { TEST_F(WebRtcVideoChannel2Test, DISABLED_VideoProtectionInterop) {