zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove repeat flag from SendRTCP

Browse Source 
It is always false

BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2684023002
Cr-Commit-Position: refs/heads/master@{#16491}
This commit is contained in:
danilchap
2017-02-08 05:24:31 -08:00
committed by Commit bot
parent fd8f102a84
commit 498ee8e816
4 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
View File

@ -454,7 +454,7 @@ TEST_F(RtcpSenderTest, SetInvalidApplicationSpecificData) {
0, 0, kData, kInvalidDataLength)); // Should by multiple of 4.
}
TEST_F(RtcpSenderTest, SendFirNonRepeat) {
TEST_F(RtcpSenderTest, SendFir) {
rtcp_sender_->SetRTCPStatus(RtcpMode::kReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpFir));
EXPECT_EQ(1, parser()->fir()->num_packets());
@ -462,25 +462,11 @@ TEST_F(RtcpSenderTest, SendFirNonRepeat) {
EXPECT_EQ(1U, parser()->fir()->requests().size());
EXPECT_EQ(kRemoteSsrc, parser()->fir()->requests()[0].ssrc);
uint8_t seq = parser()->fir()->requests()[0].seq_nr;
// Sends non-repeat FIR as default.
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpFir));
EXPECT_EQ(2, parser()->fir()->num_packets());
EXPECT_EQ(seq + 1, parser()->fir()->requests()[0].seq_nr);
}
TEST_F(RtcpSenderTest, SendFirRepeat) {
rtcp_sender_->SetRTCPStatus(RtcpMode::kReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpFir));
EXPECT_EQ(1, parser()->fir()->num_packets());
EXPECT_EQ(1U, parser()->fir()->requests().size());
uint8_t seq = parser()->fir()->requests()[0].seq_nr;
const bool kRepeat = true;
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpFir, 0, nullptr,
kRepeat));
EXPECT_EQ(2, parser()->fir()->num_packets());
EXPECT_EQ(seq, parser()->fir()->requests()[0].seq_nr);
}
TEST_F(RtcpSenderTest, SendPli) {
rtcp_sender_->SetRTCPStatus(RtcpMode::kReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpPli));
@ -496,7 +482,7 @@ TEST_F(RtcpSenderTest, SendRpsi) {
RTCPSender::FeedbackState feedback_state = rtp_rtcp_impl_->GetFeedbackState();
feedback_state.send_payload_type = kPayloadType;
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state, kRtcpRpsi, 0, nullptr,
false, kPictureId));
kPictureId));
EXPECT_EQ(1, parser()->rpsi()->num_packets());
EXPECT_EQ(kPayloadType, parser()->rpsi()->payload_type());
EXPECT_EQ(kPictureId, parser()->rpsi()->picture_id());
@ -508,7 +494,7 @@ TEST_F(RtcpSenderTest, SendSli) {
const uint8_t kPictureId = 60;
rtcp_sender_->SetRTCPStatus(RtcpMode::kReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpSli, 0, nullptr,
false, kPictureId));
kPictureId));
EXPECT_EQ(1, parser()->sli()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->sli()->sender_ssrc());
EXPECT_EQ(kRemoteSsrc, parser()->sli()->media_ssrc());