Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(514)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc

Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/common_types.h ('K') | « webrtc/modules/rtp_rtcp/source/rtcp_sender.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index 33c3f84236c385d41b86b0e6d8b233394abb5f1a..7320554b34d87a8a0a24534c652db13112d06648 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -262,8 +262,8 @@ class RtcpSenderTest : public ::testing::Test {
TEST_F(RtcpSenderTest, SetRtcpStatus) {
EXPECT_EQ(kRtcpOff, rtcp_sender_->Status());
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
- EXPECT_EQ(kRtcpNonCompound, rtcp_sender_->Status());
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
+ EXPECT_EQ(kRtcpReducedSize, rtcp_sender_->Status());
}
TEST_F(RtcpSenderTest, SetSendingStatus) {
@@ -280,7 +280,7 @@ TEST_F(RtcpSenderTest, NoPacketSentIfOff) {
TEST_F(RtcpSenderTest, SendSr) {
const uint32_t kPacketCount = 0x12345;
const uint32_t kOctetCount = 0x23456;
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
RTCPSender::FeedbackState feedback_state = rtp_rtcp_impl_->GetFeedbackState();
feedback_state.packets_sent = kPacketCount;
feedback_state.media_bytes_sent = kOctetCount;
@@ -298,7 +298,7 @@ TEST_F(RtcpSenderTest, SendSr) {
}
TEST_F(RtcpSenderTest, SendRr) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpRr));
EXPECT_EQ(1, parser()->receiver_report()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->receiver_report()->Ssrc());
@@ -333,7 +333,7 @@ TEST_F(RtcpSenderTest, SendRrWithTwoReportBlocks) {
}
TEST_F(RtcpSenderTest, SendSdes) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SetCNAME("alice@host"));
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpSdes));
EXPECT_EQ(1, parser()->sdes()->num_packets());
@@ -352,14 +352,14 @@ TEST_F(RtcpSenderTest, SdesIncludedInCompoundPacket) {
}
TEST_F(RtcpSenderTest, SendBye) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpBye));
EXPECT_EQ(1, parser()->bye()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->bye()->Ssrc());
}
TEST_F(RtcpSenderTest, StopSendingTriggersBye) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SetSendingStatus(feedback_state(), true));
EXPECT_EQ(0, rtcp_sender_->SetSendingStatus(feedback_state(), false));
EXPECT_EQ(1, parser()->bye()->num_packets());
@@ -376,7 +376,7 @@ TEST_F(RtcpSenderTest, SendApp) {
const uint16_t kDataLength = sizeof(kData) / sizeof(kData[0]);
EXPECT_EQ(0, rtcp_sender_->SetApplicationSpecificData(kSubType, name, kData,
kDataLength));
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpApp));
EXPECT_EQ(1, parser()->app()->num_packets());
EXPECT_EQ(kSubType, parser()->app()->SubType());
@@ -395,7 +395,7 @@ TEST_F(RtcpSenderTest, SendEmptyApp) {
EXPECT_EQ(
0, rtcp_sender_->SetApplicationSpecificData(kSubType, kName, nullptr, 0));
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpApp));
EXPECT_EQ(1, parser()->app()->num_packets());
EXPECT_EQ(kSubType, parser()->app()->SubType());
@@ -411,7 +411,7 @@ TEST_F(RtcpSenderTest, SetInvalidApplicationSpecificData) {
}
TEST_F(RtcpSenderTest, SendFirNonRepeat) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpFir));
EXPECT_EQ(1, parser()->fir()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->fir()->Ssrc());
@@ -426,7 +426,7 @@ TEST_F(RtcpSenderTest, SendFirNonRepeat) {
}
TEST_F(RtcpSenderTest, SendFirRepeat) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpFir));
EXPECT_EQ(1, parser()->fir()->num_packets());
EXPECT_EQ(1, parser()->fir_item()->num_packets());
@@ -440,7 +440,7 @@ TEST_F(RtcpSenderTest, SendFirRepeat) {
}
TEST_F(RtcpSenderTest, SendPli) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpPli));
EXPECT_EQ(1, parser()->pli()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->pli()->Ssrc());
@@ -450,7 +450,7 @@ TEST_F(RtcpSenderTest, SendPli) {
TEST_F(RtcpSenderTest, SendRpsi) {
const uint64_t kPictureId = 0x41;
const int8_t kPayloadType = 100;
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
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,
@@ -463,7 +463,7 @@ TEST_F(RtcpSenderTest, SendSli) {
const uint16_t kFirstMb = 0;
const uint16_t kNumberOfMb = 0x1FFF;
const uint8_t kPictureId = 60;
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpSli, 0, nullptr,
false, kPictureId));
EXPECT_EQ(1, parser()->sli()->num_packets());
@@ -476,7 +476,7 @@ TEST_F(RtcpSenderTest, SendSli) {
}
TEST_F(RtcpSenderTest, SendNack) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
const uint16_t kList[] = {0, 1, 16};
const int32_t kListLength = sizeof(kList) / sizeof(kList[0]);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpNack, kListLength,
@@ -493,7 +493,7 @@ TEST_F(RtcpSenderTest, SendRemb) {
std::vector<uint32_t> ssrcs;
ssrcs.push_back(kRemoteSsrc);
ssrcs.push_back(kRemoteSsrc + 1);
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
rtcp_sender_->SetREMBData(kBitrate, ssrcs);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpRemb));
EXPECT_EQ(1, parser()->psfb_app()->num_packets());
@@ -533,7 +533,7 @@ TEST_F(RtcpSenderTest, RembNotIncludedInCompoundPacketIfNotEnabled) {
}
TEST_F(RtcpSenderTest, SendXrWithVoipMetric) {
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
RTCPVoIPMetric metric;
metric.lossRate = 1;
metric.discardRate = 2;
@@ -671,7 +671,7 @@ TEST_F(RtcpSenderTest, TestRegisterRtcpPacketTypeObserver) {
new RTCPSender(false, &clock_, receive_statistics_.get(), &observer));
rtcp_sender_->SetRemoteSSRC(kRemoteSsrc);
EXPECT_EQ(0, rtcp_sender_->RegisterSendTransport(&test_transport_));
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpPli));
EXPECT_EQ(1, parser()->pli()->num_packets());
EXPECT_EQ(kRemoteSsrc, observer.ssrc_);
@@ -682,7 +682,7 @@ TEST_F(RtcpSenderTest, TestRegisterRtcpPacketTypeObserver) {
TEST_F(RtcpSenderTest, SendTmmbr) {
const unsigned int kBitrateBps = 312000;
- rtcp_sender_->SetRTCPStatus(kRtcpNonCompound);
+ rtcp_sender_->SetRTCPStatus(kRtcpReducedSize);
rtcp_sender_->SetTargetBitrate(kBitrateBps);
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpTmmbr));
EXPECT_EQ(1, parser()->tmmbr()->num_packets());
« webrtc/common_types.h ('K') | « webrtc/modules/rtp_rtcp/source/rtcp_sender.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698