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

Set NACKed packet to -1 in TestNackRetransmission.

Browse Source 
Zero is a valid sequence number which may occur even if there are no
retransmissions, this caused the test to flake as an incoming packet
would be mistaken for a retransmission.

BUG=2830
R=stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5417 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-01-23 16:14:34 +00:00
parent 0e93257cee
commit e7223e7795
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/video/video_send_stream_tests.cc
View File

@ -507,7 +507,7 @@ void VideoSendStreamTest::TestNackRetransmission(
send_count_(0), send_count_(0),
retransmit_ssrc_(retransmit_ssrc), retransmit_ssrc_(retransmit_ssrc),
retransmit_payload_type_(retransmit_payload_type), retransmit_payload_type_(retransmit_payload_type),
nacked_sequence_number_(0) {} nacked_sequence_number_(-1) {}
virtual Action OnSendRtp(const uint8_t* packet, size_t length) OVERRIDE { virtual Action OnSendRtp(const uint8_t* packet, size_t length) OVERRIDE {
RTPHeader header; RTPHeader header;
@ -516,7 +516,8 @@ void VideoSendStreamTest::TestNackRetransmission(
// Nack second packet after receiving the third one. // Nack second packet after receiving the third one.
if (++send_count_ == 3) { if (++send_count_ == 3) {
nacked_sequence_number_ = header.sequenceNumber - 1; uint16_t nack_sequence_number = header.sequenceNumber - 1;
nacked_sequence_number_ = nack_sequence_number;
NullReceiveStatistics null_stats; NullReceiveStatistics null_stats;
RTCPSender rtcp_sender( RTCPSender rtcp_sender(
0, false, Clock::GetRealTimeClock(), &null_stats); 0, false, Clock::GetRealTimeClock(), &null_stats);
@ -529,7 +530,7 @@ void VideoSendStreamTest::TestNackRetransmission(
EXPECT_EQ(0, EXPECT_EQ(0,
rtcp_sender.SendRTCP( rtcp_sender.SendRTCP(
feedback_state, kRtcpNack, 1, &nacked_sequence_number_)); feedback_state, kRtcpNack, 1, &nack_sequence_number));
} }
uint16_t sequence_number = header.sequenceNumber; uint16_t sequence_number = header.sequenceNumber;
@ -554,7 +555,7 @@ void VideoSendStreamTest::TestNackRetransmission(
int send_count_; int send_count_;
uint32_t retransmit_ssrc_; uint32_t retransmit_ssrc_;
uint8_t retransmit_payload_type_; uint8_t retransmit_payload_type_;
uint16_t nacked_sequence_number_; int nacked_sequence_number_;
} observer(retransmit_ssrc, retransmit_payload_type); } observer(retransmit_ssrc, retransmit_payload_type);
Call::Config call_config(observer.SendTransport()); Call::Config call_config(observer.SendTransport());