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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1527003002: [rtp_rtcp] RtcpReceiverTest rewritten using public available interface (observers) instead intermid… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 10 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/modules/rtp_rtcp/source/rtcp_receiver.cc ('K') | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index c6df905688bc492335aab0094648d4f6b83a2d65..b5a89cc7b2d71854770360f743130526ddd41c49 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -16,8 +16,8 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/common_types.h"
-#include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h"
-#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h"
+#include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h"
+#include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_observers.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
@@ -25,159 +25,127 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
#include "webrtc/modules/rtp_rtcp/source/time_util.h"
#include "webrtc/system_wrappers/include/ntp_time.h"
+#include "webrtc/test/mock_transport.h"
+
+using testing::_;
+using testing::AllOf;
+using testing::Field;
+using testing::IsEmpty;
+using testing::NiceMock;
+using testing::Property;
+using testing::SizeIs;
+using testing::StrEq;
+using testing::StrictMock;
+using testing::UnorderedElementsAre;
namespace webrtc {
-namespace { // Anonymous namespace; hide utility functions and classes.
-
-// This test transport verifies that no functions get called.
-class TestTransport : public Transport,
- public NullRtpData {
- public:
- explicit TestTransport() : rtcp_receiver_(nullptr) {}
- void SetRTCPReceiver(RTCPReceiver* rtcp_receiver) {
- rtcp_receiver_ = rtcp_receiver;
- }
- bool SendRtp(const uint8_t* /*data*/,
- size_t /*len*/,
- const PacketOptions& options) override {
- ADD_FAILURE(); // FAIL() gives a compile error.
- return false;
- }
-
- bool SendRtcp(const uint8_t* packet, size_t packet_len) override {
- ADD_FAILURE();
- return true;
- }
-
- int OnReceivedPayloadData(const uint8_t* payloadData,
- const size_t payloadSize,
- const WebRtcRTPHeader* rtpHeader) override {
- ADD_FAILURE();
- return 0;
- }
- RTCPReceiver* rtcp_receiver_;
-};
-
class RtcpReceiverTest : public ::testing::Test {
protected:
- RtcpReceiverTest()
- : over_use_detector_options_(),
- system_clock_(1335900000),
- remote_bitrate_observer_(),
- remote_bitrate_estimator_(
- new RemoteBitrateEstimatorSingleStream(&remote_bitrate_observer_,
- &system_clock_)) {
- test_transport_ = new TestTransport();
-
+ RtcpReceiverTest() : system_clock_(1335900000) {
RtpRtcp::Configuration configuration;
configuration.audio = false;
configuration.clock = &system_clock_;
- configuration.outgoing_transport = test_transport_;
- configuration.remote_bitrate_estimator = remote_bitrate_estimator_.get();
- rtp_rtcp_impl_ = new ModuleRtpRtcpImpl(configuration);
- rtcp_receiver_ = new RTCPReceiver(&system_clock_, false, nullptr, nullptr,
- nullptr, nullptr, rtp_rtcp_impl_);
- test_transport_->SetRTCPReceiver(rtcp_receiver_);
+ configuration.outgoing_transport = &transport_;
+ configuration.remote_bitrate_estimator = &remote_bitrate_estimator_;
+ rtp_rtcp_impl_.reset(new ModuleRtpRtcpImpl(configuration));
+ rtcp_receiver_.reset(
+ new RTCPReceiver(&system_clock_, false, &packet_type_counter_observer_,
+ &bandwidth_observer_, &intra_frame_observer_,
+ &transport_feedback_observer_, rtp_rtcp_impl_.get()));
+ }
+
+ void InjectPacket(const rtcp::RtcpPacket& packet) {
+ rtc::Buffer raw = packet.Build();
+ EXPECT_TRUE(rtcp_receiver_->IncomingPacket(raw.data(), raw.size()));
}
- ~RtcpReceiverTest() {
- delete rtcp_receiver_;
- delete rtp_rtcp_impl_;
- delete test_transport_;
+
+ void SetSsrc(uint32_t ssrc) {
+ std::set<uint32_t> ssrcs;
+ ssrcs.insert(ssrc);
+ EXPECT_CALL(intra_frame_observer_, OnLocalSsrcChanged(0, ssrc));
+ rtcp_receiver_->SetSsrcs(ssrc, ssrcs);
}
- // Injects an RTCP packet into the receiver.
- // Returns 0 for OK, non-0 for failure.
- int InjectRtcpPacket(const uint8_t* packet,
- uint16_t packet_len) {
- RTCPUtility::RTCPParserV2 rtcpParser(packet,
- packet_len,
- true); // Allow non-compound RTCP
-
- RTCPHelp::RTCPPacketInformation rtcpPacketInformation;
- EXPECT_EQ(0, rtcp_receiver_->IncomingRTCPPacket(rtcpPacketInformation,
- &rtcpParser));
- rtcp_receiver_->TriggerCallbacksFromRTCPPacket(rtcpPacketInformation);
- // The NACK list is on purpose not copied below as it isn't needed by the
- // test.
- rtcp_packet_info_.rtcpPacketTypeFlags =
- rtcpPacketInformation.rtcpPacketTypeFlags;
- rtcp_packet_info_.remoteSSRC = rtcpPacketInformation.remoteSSRC;
- rtcp_packet_info_.applicationSubType =
- rtcpPacketInformation.applicationSubType;
- rtcp_packet_info_.applicationName = rtcpPacketInformation.applicationName;
- rtcp_packet_info_.applicationLength =
- rtcpPacketInformation.applicationLength;
- rtcp_packet_info_.report_blocks = rtcpPacketInformation.report_blocks;
- rtcp_packet_info_.rtt = rtcpPacketInformation.rtt;
- rtcp_packet_info_.interArrivalJitter =
- rtcpPacketInformation.interArrivalJitter;
- rtcp_packet_info_.sliPictureId = rtcpPacketInformation.sliPictureId;
- rtcp_packet_info_.rpsiPictureId = rtcpPacketInformation.rpsiPictureId;
- rtcp_packet_info_.receiverEstimatedMaxBitrate =
- rtcpPacketInformation.receiverEstimatedMaxBitrate;
- rtcp_packet_info_.ntp_secs = rtcpPacketInformation.ntp_secs;
- rtcp_packet_info_.ntp_frac = rtcpPacketInformation.ntp_frac;
- rtcp_packet_info_.rtp_timestamp = rtcpPacketInformation.rtp_timestamp;
- rtcp_packet_info_.xr_dlrr_item = rtcpPacketInformation.xr_dlrr_item;
- if (rtcpPacketInformation.VoIPMetric)
- rtcp_packet_info_.AddVoIPMetric(rtcpPacketInformation.VoIPMetric);
- rtcp_packet_info_.transport_feedback_.reset(
- rtcpPacketInformation.transport_feedback_.release());
- return 0;
+ template <typename Container>
+ void SetSsrcs(const Container& c) {
+ std::set<uint32_t> ssrcs(std::begin(c), std::end(c));
+ ASSERT_FALSE(ssrcs.empty());
+ uint32_t main_ssrc = *std::begin(c);
+ EXPECT_CALL(intra_frame_observer_, OnLocalSsrcChanged(0, main_ssrc));
+ rtcp_receiver_->SetSsrcs(main_ssrc, ssrcs);
}
- OverUseDetectorOptions over_use_detector_options_;
SimulatedClock system_clock_;
- ModuleRtpRtcpImpl* rtp_rtcp_impl_;
- RTCPReceiver* rtcp_receiver_;
- TestTransport* test_transport_;
- RTCPHelp::RTCPPacketInformation rtcp_packet_info_;
- MockRemoteBitrateObserver remote_bitrate_observer_;
- rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
-};
+ StrictMock<MockTransport> transport_;
+ StrictMock<MockRemoteBitrateEstimator> remote_bitrate_estimator_;
+ rtc::scoped_ptr<ModuleRtpRtcpImpl> rtp_rtcp_impl_;
+
+ // Callbacks to packet_type_counter_observer are frequent but most of the time
+ // are not interesting.
+ NiceMock<MockRtcpPacketTypeCounterObserver> packet_type_counter_observer_;
+ StrictMock<MockRtcpBandwidthObserver> bandwidth_observer_;
+ StrictMock<MockRtcpIntraFrameObserver> intra_frame_observer_;
+ StrictMock<MockTransportFeedbackObserver> transport_feedback_observer_;
+ rtc::scoped_ptr<RTCPReceiver> rtcp_receiver_;
+};
TEST_F(RtcpReceiverTest, BrokenPacketIsIgnored) {
const uint8_t bad_packet[] = {0, 0, 0, 0};
- EXPECT_EQ(0, InjectRtcpPacket(bad_packet, sizeof(bad_packet)));
- EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
+ int64_t now = system_clock_.TimeInMilliseconds();
+ EXPECT_CALL(packet_type_counter_observer_,
+ RtcpPacketTypesCounterUpdated(_, _))
+ .Times(0);
+ EXPECT_FALSE(rtcp_receiver_->IncomingPacket(bad_packet, sizeof(bad_packet)));
+ EXPECT_NE(now, rtcp_receiver_->LastReceived());
}
TEST_F(RtcpReceiverTest, InjectSrPacket) {
const uint32_t kSenderSsrc = 0x10203;
+ int64_t now = system_clock_.TimeInMilliseconds();
rtcp::SenderReport sr;
sr.From(kSenderSsrc);
- rtc::Buffer packet = sr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(IsEmpty(), _, now));
+ InjectPacket(sr);
+ // The packet should be processed.
+ EXPECT_EQ(now, rtcp_receiver_->LastReceived());
// The parser will note the remote SSRC on a SR from other than his
// expected peer, but will not flag that he's gotten a packet.
- EXPECT_EQ(kSenderSsrc, rtcp_packet_info_.remoteSSRC);
- EXPECT_EQ(0U, kRtcpSr & rtcp_packet_info_.rtcpPacketTypeFlags);
+ RTCPSenderInfo info;
+ EXPECT_EQ(-1, rtcp_receiver_->SenderInfoReceived(&info));
}
TEST_F(RtcpReceiverTest, InjectSrPacketFromExpectedPeer) {
const uint32_t kSenderSsrc = 0x10203;
+ int64_t now = system_clock_.TimeInMilliseconds();
+
+ RTCPSenderInfo info;
rtcp_receiver_->SetRemoteSSRC(kSenderSsrc);
rtcp::SenderReport sr;
sr.From(kSenderSsrc);
- rtc::Buffer packet = sr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kSenderSsrc, rtcp_packet_info_.remoteSSRC);
- EXPECT_EQ(kRtcpSr, rtcp_packet_info_.rtcpPacketTypeFlags);
+
+ EXPECT_EQ(-1, rtcp_receiver_->SenderInfoReceived(&info));
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(IsEmpty(), _, now));
+ InjectPacket(sr);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceived());
+ EXPECT_EQ(0, rtcp_receiver_->SenderInfoReceived(&info));
}
TEST_F(RtcpReceiverTest, InjectSrPacketCalculatesRTT) {
@@ -189,9 +157,7 @@ TEST_F(RtcpReceiverTest, InjectSrPacketCalculatesRTT) {
const uint32_t kDelayMs = CompactNtpIntervalToMs(kDelayNtp);
rtcp_receiver_->SetRemoteSSRC(kSenderSsrc);
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kRemoteSsrc);
- rtcp_receiver_->SetSsrcs(kRemoteSsrc, ssrcs);
+ SetSsrc(kRemoteSsrc);
int64_t rtt_ms = 0;
EXPECT_EQ(
@@ -208,8 +174,8 @@ TEST_F(RtcpReceiverTest, InjectSrPacketCalculatesRTT) {
block.WithDelayLastSr(kDelayNtp);
sr.WithReportBlock(block);
- rtc::Buffer packet = sr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(sr);
EXPECT_EQ(
0, rtcp_receiver_->RTT(kSenderSsrc, &rtt_ms, nullptr, nullptr, nullptr));
@@ -218,32 +184,36 @@ TEST_F(RtcpReceiverTest, InjectSrPacketCalculatesRTT) {
TEST_F(RtcpReceiverTest, InjectRrPacket) {
const uint32_t kSenderSsrc = 0x10203;
+ int64_t now = system_clock_.TimeInMilliseconds();
+
rtcp::ReceiverReport rr;
rr.From(kSenderSsrc);
- rtc::Buffer packet = rr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kSenderSsrc, rtcp_packet_info_.remoteSSRC);
- EXPECT_EQ(kRtcpRr, rtcp_packet_info_.rtcpPacketTypeFlags);
- ASSERT_EQ(0u, rtcp_packet_info_.report_blocks.size());
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(IsEmpty(), _, now));
+ InjectPacket(rr);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceived());
+ RTCPSenderInfo info;
+ EXPECT_EQ(-1, rtcp_receiver_->SenderInfoReceived(&info));
+ EXPECT_EQ(now, rtcp_receiver_->LastReceivedReceiverReport());
+ std::vector<RTCPReportBlock> report_blocks;
+ rtcp_receiver_->StatisticsReceived(&report_blocks);
+ EXPECT_TRUE(report_blocks.empty());
}
TEST_F(RtcpReceiverTest, InjectRrPacketWithReportBlockNotToUsIgnored) {
const uint32_t kSenderSsrc = 0x10203;
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
-
+ int64_t now = system_clock_.TimeInMilliseconds();
+ SetSsrc(kSourceSsrc);
rtcp::ReportBlock rb;
rb.To(kSourceSsrc + 1);
rtcp::ReceiverReport rr;
rr.From(kSenderSsrc);
rr.WithReportBlock(rb);
- rtc::Buffer packet = rr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kSenderSsrc, rtcp_packet_info_.remoteSSRC);
- EXPECT_EQ(kRtcpRr, rtcp_packet_info_.rtcpPacketTypeFlags);
- ASSERT_EQ(0u, rtcp_packet_info_.report_blocks.size());
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(IsEmpty(), _, now));
+ InjectPacket(rr);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceivedReceiverReport());
std::vector<RTCPReportBlock> received_blocks;
rtcp_receiver_->StatisticsReceived(&received_blocks);
@@ -253,20 +223,18 @@ TEST_F(RtcpReceiverTest, InjectRrPacketWithReportBlockNotToUsIgnored) {
TEST_F(RtcpReceiverTest, InjectRrPacketWithOneReportBlock) {
const uint32_t kSenderSsrc = 0x10203;
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ int64_t now = system_clock_.TimeInMilliseconds();
+ SetSsrc(kSourceSsrc);
rtcp::ReportBlock rb;
rb.To(kSourceSsrc);
rtcp::ReceiverReport rr;
rr.From(kSenderSsrc);
rr.WithReportBlock(rb);
- rtc::Buffer packet = rr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kSenderSsrc, rtcp_packet_info_.remoteSSRC);
- EXPECT_EQ(kRtcpRr, rtcp_packet_info_.rtcpPacketTypeFlags);
- ASSERT_EQ(1u, rtcp_packet_info_.report_blocks.size());
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(SizeIs(1), _, now));
+ InjectPacket(rr);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceivedReceiverReport());
std::vector<RTCPReportBlock> received_blocks;
rtcp_receiver_->StatisticsReceived(&received_blocks);
@@ -279,10 +247,9 @@ TEST_F(RtcpReceiverTest, InjectRrPacketWithTwoReportBlocks) {
const uint16_t kSequenceNumbers[] = {10, 12423};
const uint32_t kCumLost[] = {13, 555};
const uint8_t kFracLost[] = {20, 11};
- const int kNumSsrcs = sizeof(kSourceSsrcs) / sizeof(kSourceSsrcs[0]);
+ int64_t now = system_clock_.TimeInMilliseconds();
- std::set<uint32_t> ssrcs(kSourceSsrcs, kSourceSsrcs + kNumSsrcs);
- rtcp_receiver_->SetSsrcs(kSourceSsrcs[0], ssrcs);
+ SetSsrcs(kSourceSsrcs);
rtcp::ReportBlock rb1;
rb1.To(kSourceSsrcs[0]);
@@ -299,11 +266,21 @@ TEST_F(RtcpReceiverTest, InjectRrPacketWithTwoReportBlocks) {
rr1.WithReportBlock(rb1);
rr1.WithReportBlock(rb2);
- rtc::Buffer p1 = rr1.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p1.data(), p1.size()));
- ASSERT_EQ(2u, rtcp_packet_info_.report_blocks.size());
- EXPECT_EQ(10, rtcp_packet_info_.report_blocks.front().fractionLost);
- EXPECT_EQ(0, rtcp_packet_info_.report_blocks.back().fractionLost);
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(SizeIs(2), _, now));
+
+ InjectPacket(rr1);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceivedReceiverReport());
+
+ std::vector<RTCPReportBlock> received_blocks;
+ rtcp_receiver_->StatisticsReceived(&received_blocks);
+
+ ASSERT_EQ(2u, received_blocks.size());
+ {
+ int fraction_losts[2] = {received_blocks[0].fractionLost,
+ received_blocks[1].fractionLost};
+ EXPECT_THAT(fraction_losts, UnorderedElementsAre(0, 10));
+ }
rtcp::ReportBlock rb3;
rb3.To(kSourceSsrcs[0]);
@@ -322,35 +299,37 @@ TEST_F(RtcpReceiverTest, InjectRrPacketWithTwoReportBlocks) {
rr2.WithReportBlock(rb3);
rr2.WithReportBlock(rb4);
- rtc::Buffer p2 = rr2.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p2.data(), p2.size()));
- ASSERT_EQ(2u, rtcp_packet_info_.report_blocks.size());
- EXPECT_EQ(kFracLost[0], rtcp_packet_info_.report_blocks.front().fractionLost);
- EXPECT_EQ(kFracLost[1], rtcp_packet_info_.report_blocks.back().fractionLost);
+ system_clock_.AdvanceTimeMilliseconds(500);
+ now = system_clock_.TimeInMilliseconds();
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(SizeIs(2), _, now));
+ InjectPacket(rr2);
- std::vector<RTCPReportBlock> received_blocks;
+ received_blocks.clear();
rtcp_receiver_->StatisticsReceived(&received_blocks);
EXPECT_EQ(2u, received_blocks.size());
- for (size_t i = 0; i < received_blocks.size(); ++i) {
- EXPECT_EQ(kSenderSsrc, received_blocks[i].remoteSSRC);
- EXPECT_EQ(kSourceSsrcs[i], received_blocks[i].sourceSSRC);
- EXPECT_EQ(kFracLost[i], received_blocks[i].fractionLost);
- EXPECT_EQ(kCumLost[i], received_blocks[i].cumulativeLost);
- EXPECT_EQ(kSequenceNumbers[i], received_blocks[i].extendedHighSeqNum);
- }
+ EXPECT_THAT(received_blocks,
+ UnorderedElementsAre(
+ AllOf(Field(&RTCPReportBlock::sourceSSRC, kSourceSsrcs[0]),
+ Field(&RTCPReportBlock::fractionLost, kFracLost[0]),
+ Field(&RTCPReportBlock::cumulativeLost, kCumLost[0]),
+ Field(&RTCPReportBlock::extendedHighSeqNum,
+ kSequenceNumbers[0])),
+ AllOf(Field(&RTCPReportBlock::sourceSSRC, kSourceSsrcs[1]),
+ Field(&RTCPReportBlock::fractionLost, kFracLost[1]),
+ Field(&RTCPReportBlock::cumulativeLost, kCumLost[1]),
+ Field(&RTCPReportBlock::extendedHighSeqNum,
+ kSequenceNumbers[1]))));
}
TEST_F(RtcpReceiverTest, InjectRrPacketsFromTwoRemoteSsrcs) {
- const uint32_t kSenderSsrc1 = 0x10203;
- const uint32_t kSenderSsrc2 = 0x20304;
+ const uint32_t kSenderSsrc[] = {0x10203, 0x20304};
const uint32_t kSourceSsrcs[] = {0x40506, 0x50607};
const uint16_t kSequenceNumbers[] = {10, 12423};
const uint32_t kCumLost[] = {13, 555};
const uint8_t kFracLost[] = {20, 11};
- const int kNumSsrcs = sizeof(kSourceSsrcs) / sizeof(kSourceSsrcs[0]);
- std::set<uint32_t> ssrcs(kSourceSsrcs, kSourceSsrcs + kNumSsrcs);
- rtcp_receiver_->SetSsrcs(kSourceSsrcs[0], ssrcs);
+ SetSsrcs(kSourceSsrcs);
rtcp::ReportBlock rb1;
rb1.To(kSourceSsrcs[0]);
@@ -358,18 +337,19 @@ TEST_F(RtcpReceiverTest, InjectRrPacketsFromTwoRemoteSsrcs) {
rb1.WithFractionLost(kFracLost[0]);
rb1.WithCumulativeLost(kCumLost[0]);
rtcp::ReceiverReport rr1;
- rr1.From(kSenderSsrc1);
+ rr1.From(kSenderSsrc[0]);
rr1.WithReportBlock(rb1);
- rtc::Buffer p1 = rr1.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p1.data(), p1.size()));
- ASSERT_EQ(1u, rtcp_packet_info_.report_blocks.size());
- EXPECT_EQ(kFracLost[0], rtcp_packet_info_.report_blocks.front().fractionLost);
+ int64_t now = system_clock_.TimeInMilliseconds();
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(SizeIs(1), _, now));
+ InjectPacket(rr1);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceivedReceiverReport());
std::vector<RTCPReportBlock> received_blocks;
rtcp_receiver_->StatisticsReceived(&received_blocks);
EXPECT_EQ(1u, received_blocks.size());
- EXPECT_EQ(kSenderSsrc1, received_blocks[0].remoteSSRC);
+ EXPECT_EQ(kSenderSsrc[0], received_blocks[0].remoteSSRC);
EXPECT_EQ(kSourceSsrcs[0], received_blocks[0].sourceSSRC);
EXPECT_EQ(kFracLost[0], received_blocks[0].fractionLost);
EXPECT_EQ(kCumLost[0], received_blocks[0].cumulativeLost);
@@ -381,32 +361,37 @@ TEST_F(RtcpReceiverTest, InjectRrPacketsFromTwoRemoteSsrcs) {
rb2.WithFractionLost(kFracLost[1]);
rb2.WithCumulativeLost(kCumLost[1]);
rtcp::ReceiverReport rr2;
- rr2.From(kSenderSsrc2);
+ rr2.From(kSenderSsrc[1]);
rr2.WithReportBlock(rb2);
- rtc::Buffer p2 = rr2.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p2.data(), p2.size()));
- ASSERT_EQ(1u, rtcp_packet_info_.report_blocks.size());
- EXPECT_EQ(kFracLost[1], rtcp_packet_info_.report_blocks.front().fractionLost);
+
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(SizeIs(1), _, now));
+ InjectPacket(rr2);
received_blocks.clear();
rtcp_receiver_->StatisticsReceived(&received_blocks);
ASSERT_EQ(2u, received_blocks.size());
- EXPECT_EQ(kSenderSsrc1, received_blocks[0].remoteSSRC);
- EXPECT_EQ(kSenderSsrc2, received_blocks[1].remoteSSRC);
- for (size_t i = 0; i < received_blocks.size(); ++i) {
- EXPECT_EQ(kSourceSsrcs[0], received_blocks[i].sourceSSRC);
- EXPECT_EQ(kFracLost[i], received_blocks[i].fractionLost);
- EXPECT_EQ(kCumLost[i], received_blocks[i].cumulativeLost);
- EXPECT_EQ(kSequenceNumbers[i], received_blocks[i].extendedHighSeqNum);
- }
+ // Order is not guaranteed.
+ EXPECT_THAT(received_blocks,
+ UnorderedElementsAre(
+ AllOf(Field(&RTCPReportBlock::sourceSSRC, kSourceSsrcs[0]),
+ Field(&RTCPReportBlock::remoteSSRC, kSenderSsrc[0]),
+ Field(&RTCPReportBlock::fractionLost, kFracLost[0]),
+ Field(&RTCPReportBlock::cumulativeLost, kCumLost[0]),
+ Field(&RTCPReportBlock::extendedHighSeqNum,
+ kSequenceNumbers[0])),
+ AllOf(Field(&RTCPReportBlock::sourceSSRC, kSourceSsrcs[0]),
+ Field(&RTCPReportBlock::remoteSSRC, kSenderSsrc[1]),
+ Field(&RTCPReportBlock::fractionLost, kFracLost[1]),
+ Field(&RTCPReportBlock::cumulativeLost, kCumLost[1]),
+ Field(&RTCPReportBlock::extendedHighSeqNum,
+ kSequenceNumbers[1]))));
}
TEST_F(RtcpReceiverTest, GetRtt) {
const uint32_t kSenderSsrc = 0x10203;
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
// No report block received.
EXPECT_EQ(
@@ -414,14 +399,15 @@ TEST_F(RtcpReceiverTest, GetRtt) {
rtcp::ReportBlock rb;
rb.To(kSourceSsrc);
+ rb.WithLastSr(0x12344321);
rtcp::ReceiverReport rr;
rr.From(kSenderSsrc);
rr.WithReportBlock(rb);
- rtc::Buffer packet = rr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kSenderSsrc, rtcp_packet_info_.remoteSSRC);
- EXPECT_EQ(kRtcpRr, rtcp_packet_info_.rtcpPacketTypeFlags);
- EXPECT_EQ(1u, rtcp_packet_info_.report_blocks.size());
+ int64_t now = system_clock_.TimeInMilliseconds();
+ EXPECT_CALL(bandwidth_observer_,
+ OnReceivedRtcpReceiverReport(SizeIs(1), _, now));
+ InjectPacket(rr);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceivedReceiverReport());
EXPECT_EQ(
0, rtcp_receiver_->RTT(kSenderSsrc, nullptr, nullptr, nullptr, nullptr));
@@ -430,24 +416,29 @@ TEST_F(RtcpReceiverTest, GetRtt) {
nullptr));
}
+// Currently ij packets are ignored.
TEST_F(RtcpReceiverTest, InjectIjWithNoItem) {
+ int64_t now = system_clock_.TimeInMilliseconds();
rtcp::ExtendedJitterReport ij;
- rtc::Buffer packet = ij.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
+
+ InjectPacket(ij);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceived());
}
+// Currently ij packets are ignored.
TEST_F(RtcpReceiverTest, InjectIjWithOneItem) {
+ int64_t now = system_clock_.TimeInMilliseconds();
rtcp::ExtendedJitterReport ij;
ij.WithJitter(0x11213141);
- rtc::Buffer packet = ij.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpTransmissionTimeOffset, rtcp_packet_info_.rtcpPacketTypeFlags);
- EXPECT_EQ(0x11213141U, rtcp_packet_info_.interArrivalJitter);
+ InjectPacket(ij);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceived());
+ // EXPECT_EQ(0x11213141U, rtcp_receiver->LastInterArrivalJitter());
}
+// Currently app packets are ignored.
TEST_F(RtcpReceiverTest, InjectAppWithNoData) {
+ int64_t now = system_clock_.TimeInMilliseconds();
rtcp::App app;
app.WithSubType(30);
uint32_t name = 'n' << 24;
@@ -456,15 +447,17 @@ TEST_F(RtcpReceiverTest, InjectAppWithNoData) {
name += 'e';
app.WithName(name);
- rtc::Buffer packet = app.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpApp, rtcp_packet_info_.rtcpPacketTypeFlags);
- EXPECT_EQ(30, rtcp_packet_info_.applicationSubType);
- EXPECT_EQ(name, rtcp_packet_info_.applicationName);
- EXPECT_EQ(0, rtcp_packet_info_.applicationLength);
+ InjectPacket(app);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceived());
+ // EXPECT_EQ(kRtcpApp, rtcp_packet_info_.rtcpPacketTypeFlags);
+ // EXPECT_EQ(30, rtcp_packet_info_.applicationSubType);
+ // EXPECT_EQ(name, rtcp_packet_info_.applicationName);
+ // EXPECT_EQ(0, rtcp_packet_info_.applicationLength);
}
+// Currently app packets are ignored.
TEST_F(RtcpReceiverTest, InjectAppWithData) {
+ int64_t now = system_clock_.TimeInMilliseconds();
rtcp::App app;
app.WithSubType(30);
uint32_t name = 'n' << 24;
@@ -472,25 +465,28 @@ TEST_F(RtcpReceiverTest, InjectAppWithData) {
name += 'm' << 8;
name += 'e';
app.WithName(name);
- const char kData[] = {'t', 'e', 's', 't', 'd', 'a', 't', 'a'};
+ const uint8_t kData[] = {'t', 'e', 's', 't', 'd', 'a', 't', 'a'};
const size_t kDataLength = sizeof(kData) / sizeof(kData[0]);
- app.WithData((const uint8_t*)kData, kDataLength);
-
- rtc::Buffer packet = app.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpApp, rtcp_packet_info_.rtcpPacketTypeFlags);
- EXPECT_EQ(30, rtcp_packet_info_.applicationSubType);
- EXPECT_EQ(name, rtcp_packet_info_.applicationName);
- EXPECT_EQ(kDataLength, rtcp_packet_info_.applicationLength);
+ app.WithData(kData, kDataLength);
+
+ InjectPacket(app);
+ EXPECT_EQ(now, rtcp_receiver_->LastReceived());
+ // EXPECT_EQ(kRtcpApp, rtcp_packet_info_.rtcpPacketTypeFlags);
+ // EXPECT_EQ(30, rtcp_packet_info_.applicationSubType);
+ // EXPECT_EQ(name, rtcp_packet_info_.applicationName);
+ // EXPECT_EQ(kDataLength, rtcp_packet_info_.applicationLength);
}
TEST_F(RtcpReceiverTest, InjectSdesWithOneChunk) {
const uint32_t kSenderSsrc = 0x123456;
rtcp::Sdes sdes;
sdes.WithCName(kSenderSsrc, "alice@host");
+ MockRtcpCallbackImpl callback;
+ rtcp_receiver_->RegisterRtcpStatisticsCallback(&callback);
+ EXPECT_CALL(callback, CNameChanged(StrEq("alice@host"), kSenderSsrc));
+
+ InjectPacket(sdes);
- rtc::Buffer packet = sdes.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
char cName[RTCP_CNAME_SIZE];
EXPECT_EQ(0, rtcp_receiver_->CNAME(kSenderSsrc, cName));
EXPECT_EQ(0, strncmp(cName, "alice@host", RTCP_CNAME_SIZE));
@@ -501,26 +497,22 @@ TEST_F(RtcpReceiverTest, InjectByePacket_RemovesCname) {
rtcp::Sdes sdes;
sdes.WithCName(kSenderSsrc, "alice@host");
- rtc::Buffer packet = sdes.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ InjectPacket(sdes);
char cName[RTCP_CNAME_SIZE];
EXPECT_EQ(0, rtcp_receiver_->CNAME(kSenderSsrc, cName));
// Verify that BYE removes the CNAME.
rtcp::Bye bye;
bye.From(kSenderSsrc);
- rtc::Buffer p2 = bye.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p2.data(), p2.size()));
+ InjectPacket(bye);
EXPECT_EQ(-1, rtcp_receiver_->CNAME(kSenderSsrc, cName));
}
TEST_F(RtcpReceiverTest, InjectByePacket_RemovesReportBlocks) {
const uint32_t kSenderSsrc = 0x10203;
const uint32_t kSourceSsrcs[] = {0x40506, 0x50607};
- const int kNumSsrcs = sizeof(kSourceSsrcs) / sizeof(kSourceSsrcs[0]);
- std::set<uint32_t> ssrcs(kSourceSsrcs, kSourceSsrcs + kNumSsrcs);
- rtcp_receiver_->SetSsrcs(kSourceSsrcs[0], ssrcs);
+ SetSsrcs(kSourceSsrcs);
rtcp::ReportBlock rb1;
rb1.To(kSourceSsrcs[0]);
@@ -531,9 +523,8 @@ TEST_F(RtcpReceiverTest, InjectByePacket_RemovesReportBlocks) {
rr.WithReportBlock(rb1);
rr.WithReportBlock(rb2);
- rtc::Buffer p1 = rr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p1.data(), p1.size()));
- ASSERT_EQ(2u, rtcp_packet_info_.report_blocks.size());
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(rr);
std::vector<RTCPReportBlock> received_blocks;
rtcp_receiver_->StatisticsReceived(&received_blocks);
EXPECT_EQ(2u, received_blocks.size());
@@ -541,15 +532,14 @@ TEST_F(RtcpReceiverTest, InjectByePacket_RemovesReportBlocks) {
// Verify that BYE removes the report blocks.
rtcp::Bye bye;
bye.From(kSenderSsrc);
- rtc::Buffer p2 = bye.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p2.data(), p2.size()));
+ InjectPacket(bye);
received_blocks.clear();
rtcp_receiver_->StatisticsReceived(&received_blocks);
EXPECT_TRUE(received_blocks.empty());
// Inject packet.
- EXPECT_EQ(0, InjectRtcpPacket(p1.data(), p1.size()));
- ASSERT_EQ(2u, rtcp_packet_info_.report_blocks.size());
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(rr);
received_blocks.clear();
rtcp_receiver_->StatisticsReceived(&received_blocks);
EXPECT_EQ(2u, received_blocks.size());
@@ -557,78 +547,79 @@ TEST_F(RtcpReceiverTest, InjectByePacket_RemovesReportBlocks) {
TEST_F(RtcpReceiverTest, InjectPliPacket) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
rtcp::Pli pli;
pli.To(kSourceSsrc);
- rtc::Buffer packet = pli.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpPli, rtcp_packet_info_.rtcpPacketTypeFlags);
+ EXPECT_CALL(packet_type_counter_observer_,
+ RtcpPacketTypesCounterUpdated(
+ kSourceSsrc, Field(&RtcpPacketTypeCounter::pli_packets, 1)));
+ EXPECT_CALL(intra_frame_observer_, OnReceivedIntraFrameRequest(kSourceSsrc));
+ InjectPacket(pli);
}
TEST_F(RtcpReceiverTest, PliPacketNotToUsIgnored) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
rtcp::Pli pli;
pli.To(kSourceSsrc + 1);
- rtc::Buffer packet = pli.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
+ EXPECT_CALL(packet_type_counter_observer_,
+ RtcpPacketTypesCounterUpdated(
+ kSourceSsrc, Field(&RtcpPacketTypeCounter::pli_packets, 0)));
+ EXPECT_CALL(intra_frame_observer_, OnReceivedIntraFrameRequest(_)).Times(0);
+ InjectPacket(pli);
}
TEST_F(RtcpReceiverTest, InjectFirPacket) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
rtcp::Fir fir;
fir.WithRequestTo(kSourceSsrc, 13);
- rtc::Buffer packet = fir.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpFir, rtcp_packet_info_.rtcpPacketTypeFlags);
+ EXPECT_CALL(packet_type_counter_observer_,
+ RtcpPacketTypesCounterUpdated(
+ kSourceSsrc, Field(&RtcpPacketTypeCounter::fir_packets, 1)));
+ EXPECT_CALL(intra_frame_observer_, OnReceivedIntraFrameRequest(kSourceSsrc));
+ InjectPacket(fir);
}
TEST_F(RtcpReceiverTest, FirPacketNotToUsIgnored) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
rtcp::Fir fir;
fir.WithRequestTo(kSourceSsrc + 1, 13);
- rtc::Buffer packet = fir.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
+ EXPECT_CALL(intra_frame_observer_, OnReceivedIntraFrameRequest(kSourceSsrc))
+ .Times(0);
+ InjectPacket(fir);
}
TEST_F(RtcpReceiverTest, InjectSliPacket) {
rtcp::Sli sli;
sli.WithPictureId(40);
- rtc::Buffer packet = sli.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpSli, rtcp_packet_info_.rtcpPacketTypeFlags);
- EXPECT_EQ(40, rtcp_packet_info_.sliPictureId);
+ EXPECT_CALL(intra_frame_observer_, OnReceivedSLI(_, 40));
+ InjectPacket(sli);
+}
+
+TEST_F(RtcpReceiverTest, InjectRPsiPacket) {
+ const uint64_t kPictureId = 0x123456789;
+ rtcp::Rpsi rpsi;
+ rpsi.WithPictureId(kPictureId);
+ EXPECT_CALL(intra_frame_observer_, OnReceivedRPSI(_, kPictureId));
+ InjectPacket(rpsi);
}
TEST_F(RtcpReceiverTest, ExtendedReportsPacketWithZeroReportBlocksIgnored) {
rtcp::ExtendedReports xr;
xr.From(0x2345);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
+ InjectPacket(xr);
}
+// Currently VOiP reports are ignored.
TEST_F(RtcpReceiverTest, InjectExtendedReportsVoipPacket) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
const uint8_t kLossRate = 123;
rtcp::VoipMetric voip_metric;
@@ -639,104 +630,114 @@ TEST_F(RtcpReceiverTest, InjectExtendedReportsVoipPacket) {
rtcp::ExtendedReports xr;
xr.From(0x2345);
xr.WithVoipMetric(voip_metric);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- ASSERT_TRUE(rtcp_packet_info_.VoIPMetric != nullptr);
- EXPECT_EQ(kLossRate, rtcp_packet_info_.VoIPMetric->lossRate);
- EXPECT_EQ(kRtcpXrVoipMetric, rtcp_packet_info_.rtcpPacketTypeFlags);
+
+ InjectPacket(xr);
}
+// Currently VOiP reports are ignored.
TEST_F(RtcpReceiverTest, ExtendedReportsVoipPacketNotToUsIgnored) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
rtcp::VoipMetric voip_metric;
voip_metric.To(kSourceSsrc + 1);
rtcp::ExtendedReports xr;
xr.From(0x2345);
xr.WithVoipMetric(voip_metric);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
+
+ InjectPacket(xr);
}
TEST_F(RtcpReceiverTest, InjectExtendedReportsReceiverReferenceTimePacket) {
+ const NtpTime kNtp(0x10203, 0x40506);
+ const uint32_t kSenderSsrc = 0x2345;
rtcp::Rrtr rrtr;
- rrtr.WithNtp(NtpTime(0x10203, 0x40506));
+ rrtr.WithNtp(kNtp);
rtcp::ExtendedReports xr;
- xr.From(0x2345);
+ xr.From(kSenderSsrc);
xr.WithRrtr(rrtr);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpXrReceiverReferenceTime,
- rtcp_packet_info_.rtcpPacketTypeFlags);
+ RtcpReceiveTimeInfo rrtime;
+ EXPECT_FALSE(rtcp_receiver_->LastReceivedXrReferenceTimeInfo(&rrtime));
+ InjectPacket(xr);
+
+ EXPECT_TRUE(rtcp_receiver_->LastReceivedXrReferenceTimeInfo(&rrtime));
+ EXPECT_EQ(rrtime.sourceSSRC, kSenderSsrc);
+ EXPECT_EQ(rrtime.lastRR, CompactNtp(kNtp));
+ EXPECT_EQ(0u, CompactNtpIntervalToMs(rrtime.delaySinceLastRR));
+
+ system_clock_.AdvanceTimeMilliseconds(1500);
+
+ EXPECT_TRUE(rtcp_receiver_->LastReceivedXrReferenceTimeInfo(&rrtime));
+ EXPECT_NEAR(1500, CompactNtpIntervalToMs(rrtime.delaySinceLastRR), 1);
}
TEST_F(RtcpReceiverTest, ExtendedReportsDlrrPacketNotToUsIgnored) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
rtcp::Dlrr dlrr;
dlrr.WithDlrrItem(kSourceSsrc + 1, 0x12345, 0x67890);
rtcp::ExtendedReports xr;
xr.From(0x2345);
xr.WithDlrr(dlrr);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
- EXPECT_FALSE(rtcp_packet_info_.xr_dlrr_item);
+ InjectPacket(xr);
+ int64_t rtt_ms = 0;
+ EXPECT_FALSE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
}
TEST_F(RtcpReceiverTest, InjectExtendedReportsDlrrPacketWithSubBlock) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ const uint32_t kLastRR = 0x12345;
+ const uint32_t kDelay = 0x23456;
+ SetSsrc(kSourceSsrc);
+ int64_t rtt_ms = 0;
rtcp::Dlrr dlrr;
- dlrr.WithDlrrItem(kSourceSsrc, 0x12345, 0x67890);
+ dlrr.WithDlrrItem(kSourceSsrc, kLastRR, kDelay);
rtcp::ExtendedReports xr;
xr.From(0x2345);
xr.WithDlrr(dlrr);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- // The parser should note the DLRR report block item.
- EXPECT_TRUE(rtcp_packet_info_.xr_dlrr_item);
+
+ EXPECT_FALSE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
+ InjectPacket(xr);
+
+ uint32_t compact_ntp_now = CompactNtp(NtpTime(system_clock_));
+ EXPECT_TRUE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
+ uint32_t rtt_ntp = compact_ntp_now - kDelay - kLastRR;
+ EXPECT_NEAR(CompactNtpIntervalToMs(rtt_ntp), rtt_ms, 1);
}
TEST_F(RtcpReceiverTest, InjectExtendedReportsDlrrPacketWithMultipleSubBlocks) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ const uint32_t kLastRR = 0x12345;
+ const uint32_t kDelay = 0x56789;
+ SetSsrc(kSourceSsrc);
rtcp::Dlrr dlrr;
+ dlrr.WithDlrrItem(kSourceSsrc, kLastRR, kDelay);
dlrr.WithDlrrItem(kSourceSsrc + 1, 0x12345, 0x67890);
dlrr.WithDlrrItem(kSourceSsrc + 2, 0x12345, 0x67890);
- dlrr.WithDlrrItem(kSourceSsrc, 0x12345, 0x67890);
+
rtcp::ExtendedReports xr;
xr.From(0x2345);
xr.WithDlrr(dlrr);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- // The parser should note the DLRR report block item.
- EXPECT_TRUE(rtcp_packet_info_.xr_dlrr_item);
+
+ InjectPacket(xr);
+ uint32_t compact_ntp_now = CompactNtp(NtpTime(system_clock_));
+ int64_t rtt_ms = 0;
+ EXPECT_TRUE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
+ uint32_t rtt_ntp = compact_ntp_now - kDelay - kLastRR;
+ EXPECT_NEAR(CompactNtpIntervalToMs(rtt_ntp), rtt_ms, 1);
}
TEST_F(RtcpReceiverTest, InjectExtendedReportsPacketWithMultipleReportBlocks) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
rtcp::Rrtr rrtr;
rtcp::Dlrr dlrr;
- dlrr.WithDlrrItem(kSourceSsrc, 0, 0x67890);
+ dlrr.WithDlrrItem(kSourceSsrc, 0x12345, 0x67890);
rtcp::VoipMetric metric;
metric.To(kSourceSsrc);
rtcp::ExtendedReports xr;
@@ -744,23 +745,18 @@ TEST_F(RtcpReceiverTest, InjectExtendedReportsPacketWithMultipleReportBlocks) {
xr.WithRrtr(rrtr);
xr.WithDlrr(dlrr);
xr.WithVoipMetric(metric);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- // The parser should not flag the packet since the RTT is not estimated.
- EXPECT_EQ(static_cast<unsigned int>(kRtcpXrReceiverReferenceTime +
- kRtcpXrVoipMetric),
- rtcp_packet_info_.rtcpPacketTypeFlags);
- // The parser should note the DLRR report block item.
- EXPECT_TRUE(rtcp_packet_info_.xr_dlrr_item);
+
+ InjectPacket(xr);
+
+ RtcpReceiveTimeInfo rrtime;
+ EXPECT_TRUE(rtcp_receiver_->LastReceivedXrReferenceTimeInfo(&rrtime));
+ int64_t rtt_ms = 0;
+ EXPECT_TRUE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
}
TEST_F(RtcpReceiverTest, InjectExtendedReportsPacketWithUnknownReportBlock) {
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
- std::vector<uint32_t> remote_ssrcs;
- remote_ssrcs.push_back(kSourceSsrc);
+ SetSsrc(kSourceSsrc);
rtcp::Rrtr rrtr;
rtcp::Dlrr dlrr;
@@ -769,36 +765,36 @@ TEST_F(RtcpReceiverTest, InjectExtendedReportsPacketWithUnknownReportBlock) {
metric.To(kSourceSsrc);
rtcp::ExtendedReports xr;
xr.From(0x2345);
- xr.WithRrtr(rrtr);
xr.WithDlrr(dlrr);
- xr.WithVoipMetric(metric);
+ xr.WithRrtr(rrtr);
+
rtc::Buffer packet = xr.Build();
// Modify the DLRR block to have an unsupported block type, from 5 to 6.
- uint8_t* buffer = packet.data();
- EXPECT_EQ(5, buffer[20]);
- buffer[20] = 6;
-
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(static_cast<unsigned int>(kRtcpXrReceiverReferenceTime +
- kRtcpXrVoipMetric),
- rtcp_packet_info_.rtcpPacketTypeFlags);
- EXPECT_FALSE(rtcp_packet_info_.xr_dlrr_item);
+ ASSERT_EQ(5, packet.data()[20]);
+ packet.data()[20] = 6;
+ EXPECT_TRUE(rtcp_receiver_->IncomingPacket(packet.data(), packet.size()));
+
+ // Validate Rrtr was received and processed.
+ RtcpReceiveTimeInfo rrtime;
+ EXPECT_TRUE(rtcp_receiver_->LastReceivedXrReferenceTimeInfo(&rrtime));
+ // Validate Dlrr report wasn't processed.
+ int64_t rtt_ms = 0;
+ EXPECT_FALSE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
}
-TEST_F(RtcpReceiverTest, TestXrRrRttInitiallyFalse) {
+TEST_F(RtcpReceiverTest, TestExtendedReportsRrRttInitiallyFalse) {
int64_t rtt_ms;
EXPECT_FALSE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
}
-TEST_F(RtcpReceiverTest, RttCalculatedAfterXrDlrr) {
+TEST_F(RtcpReceiverTest, RttCalculatedAfterExtendedReportsDlrr) {
Random rand(0x0123456789abcdef);
const uint32_t kSourceSsrc = rand.Rand(0x00000001u, 0xfffffffeu);
const uint32_t kRttMs = rand.Rand(1, 18 * 3600 * 1000);
const uint32_t kDelayNtp = rand.Rand<uint32_t>();
const uint32_t kDelayMs = CompactNtpIntervalToMs(kDelayNtp);
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+
+ SetSsrc(kSourceSsrc);
NtpTime now(system_clock_);
uint32_t sent_ntp = CompactNtp(now);
system_clock_.AdvanceTimeMilliseconds(kRttMs + kDelayMs);
@@ -808,8 +804,7 @@ TEST_F(RtcpReceiverTest, RttCalculatedAfterXrDlrr) {
rtcp::ExtendedReports xr;
xr.From(0x2345);
xr.WithDlrr(dlrr);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ InjectPacket(xr);
int64_t rtt_ms = 0;
EXPECT_TRUE(rtcp_receiver_->GetAndResetXrRrRtt(&rtt_ms));
@@ -831,10 +826,8 @@ TEST_F(RtcpReceiverTest, GetLastReceivedExtendedReportsReferenceTimeInfo) {
rtcp::ExtendedReports xr;
xr.From(kSenderSsrc);
xr.WithRrtr(rrtr);
- rtc::Buffer packet = xr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
- EXPECT_EQ(kRtcpXrReceiverReferenceTime,
- rtcp_packet_info_.rtcpPacketTypeFlags);
+
+ InjectPacket(xr);
RtcpReceiveTimeInfo info;
EXPECT_TRUE(rtcp_receiver_->LastReceivedXrReferenceTimeInfo(&info));
@@ -852,9 +845,7 @@ TEST_F(RtcpReceiverTest, ReceiveReportTimeout) {
const uint32_t kSourceSsrc = 0x40506;
const int64_t kRtcpIntervalMs = 1000;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
const uint16_t kSequenceNumber = 1234;
system_clock_.AdvanceTimeMilliseconds(3 * kRtcpIntervalMs);
@@ -870,15 +861,17 @@ TEST_F(RtcpReceiverTest, ReceiveReportTimeout) {
rtcp::ReceiverReport rr1;
rr1.From(kSenderSsrc);
rr1.WithReportBlock(rb1);
- rtc::Buffer p1 = rr1.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p1.data(), p1.size()));
+
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(rr1);
system_clock_.AdvanceTimeMilliseconds(3 * kRtcpIntervalMs - 1);
EXPECT_FALSE(rtcp_receiver_->RtcpRrTimeout(kRtcpIntervalMs));
EXPECT_FALSE(rtcp_receiver_->RtcpRrSequenceNumberTimeout(kRtcpIntervalMs));
// Add a RR with the same extended max as the previous RR to trigger a
// sequence number timeout, but not a RR timeout.
- EXPECT_EQ(0, InjectRtcpPacket(p1.data(), p1.size()));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(rr1);
system_clock_.AdvanceTimeMilliseconds(2);
EXPECT_FALSE(rtcp_receiver_->RtcpRrTimeout(kRtcpIntervalMs));
EXPECT_TRUE(rtcp_receiver_->RtcpRrSequenceNumberTimeout(kRtcpIntervalMs));
@@ -899,14 +892,15 @@ TEST_F(RtcpReceiverTest, ReceiveReportTimeout) {
rtcp::ReceiverReport rr2;
rr2.From(kSenderSsrc);
rr2.WithReportBlock(rb2);
- rtc::Buffer p2 = rr2.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p2.data(), p2.size()));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(rr2);
EXPECT_FALSE(rtcp_receiver_->RtcpRrTimeout(kRtcpIntervalMs));
EXPECT_FALSE(rtcp_receiver_->RtcpRrSequenceNumberTimeout(kRtcpIntervalMs));
// Verify we can get a timeout again once we've received new RR.
system_clock_.AdvanceTimeMilliseconds(2 * kRtcpIntervalMs);
- EXPECT_EQ(0, InjectRtcpPacket(p2.data(), p2.size()));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(rr2);
system_clock_.AdvanceTimeMilliseconds(kRtcpIntervalMs + 1);
EXPECT_FALSE(rtcp_receiver_->RtcpRrTimeout(kRtcpIntervalMs));
EXPECT_TRUE(rtcp_receiver_->RtcpRrSequenceNumberTimeout(kRtcpIntervalMs));
@@ -922,9 +916,7 @@ TEST_F(RtcpReceiverTest, TmmbrReceivedWithNoIncomingPacket) {
TEST_F(RtcpReceiverTest, TmmbrPacketAccepted) {
const uint32_t kMediaFlowSsrc = 0x2040608;
const uint32_t kSenderSsrc = 0x10203;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kMediaFlowSsrc); // Matches "media source" above.
- rtcp_receiver_->SetSsrcs(kMediaFlowSsrc, ssrcs);
+ SetSsrc(kMediaFlowSsrc);
rtcp::Tmmbr tmmbr;
tmmbr.From(kSenderSsrc);
@@ -933,8 +925,9 @@ TEST_F(RtcpReceiverTest, TmmbrPacketAccepted) {
rtcp::SenderReport sr;
sr.From(kSenderSsrc);
sr.Append(&tmmbr);
- rtc::Buffer packet = sr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedEstimatedBitrate(30000));
+ InjectPacket(sr);
EXPECT_EQ(1, rtcp_receiver_->TMMBRReceived(0, 0, nullptr));
TMMBRSet candidate_set;
@@ -956,21 +949,18 @@ TEST_F(RtcpReceiverTest, TmmbrPacketNotForUsIgnored) {
rtcp::SenderReport sr;
sr.From(kSenderSsrc);
sr.Append(&tmmbr);
- rtc::Buffer packet = sr.Build();
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kMediaFlowSsrc);
- rtcp_receiver_->SetSsrcs(kMediaFlowSsrc, ssrcs);
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ SetSsrc(kMediaFlowSsrc);
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedEstimatedBitrate(_)).Times(0);
+ InjectPacket(sr);
EXPECT_EQ(0, rtcp_receiver_->TMMBRReceived(0, 0, nullptr));
}
TEST_F(RtcpReceiverTest, TmmbrPacketZeroRateIgnored) {
const uint32_t kMediaFlowSsrc = 0x2040608;
const uint32_t kSenderSsrc = 0x10203;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kMediaFlowSsrc); // Matches "media source" above.
- rtcp_receiver_->SetSsrcs(kMediaFlowSsrc, ssrcs);
+ SetSsrc(kMediaFlowSsrc);
rtcp::Tmmbr tmmbr;
tmmbr.From(kSenderSsrc);
@@ -979,18 +969,16 @@ TEST_F(RtcpReceiverTest, TmmbrPacketZeroRateIgnored) {
rtcp::SenderReport sr;
sr.From(kSenderSsrc);
sr.Append(&tmmbr);
- rtc::Buffer packet = sr.Build();
-
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedEstimatedBitrate(_)).Times(0);
+ InjectPacket(sr);
EXPECT_EQ(0, rtcp_receiver_->TMMBRReceived(0, 0, nullptr));
}
TEST_F(RtcpReceiverTest, TmmbrThreeConstraintsTimeOut) {
const uint32_t kMediaFlowSsrc = 0x2040608;
const uint32_t kSenderSsrc = 0x10203;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kMediaFlowSsrc); // Matches "media source" above.
- rtcp_receiver_->SetSsrcs(kMediaFlowSsrc, ssrcs);
+ SetSsrc(kMediaFlowSsrc);
// Inject 3 packets "from" kSenderSsrc, kSenderSsrc+1, kSenderSsrc+2.
// The times of arrival are starttime + 0, starttime + 5 and starttime + 10.
@@ -1002,8 +990,9 @@ TEST_F(RtcpReceiverTest, TmmbrThreeConstraintsTimeOut) {
rtcp::SenderReport sr;
sr.From(ssrc);
sr.Append(&tmmbr);
- rtc::Buffer packet = sr.Build();
- EXPECT_EQ(0, InjectRtcpPacket(packet.data(), packet.size()));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedEstimatedBitrate(_));
+ InjectPacket(sr);
// 5 seconds between each packet.
system_clock_.AdvanceTimeMilliseconds(5000);
}
@@ -1023,31 +1012,7 @@ TEST_F(RtcpReceiverTest, TmmbrThreeConstraintsTimeOut) {
}
TEST_F(RtcpReceiverTest, Callbacks) {
- class RtcpCallbackImpl : public RtcpStatisticsCallback {
- public:
- RtcpCallbackImpl() : RtcpStatisticsCallback(), ssrc_(0) {}
- virtual ~RtcpCallbackImpl() {}
-
- void StatisticsUpdated(const RtcpStatistics& statistics,
- uint32_t ssrc) override {
- stats_ = statistics;
- ssrc_ = ssrc;
- }
-
- void CNameChanged(const char* cname, uint32_t ssrc) override {}
-
- bool Matches(uint32_t ssrc, uint32_t extended_max, uint8_t fraction_loss,
- uint32_t cumulative_loss, uint32_t jitter) {
- return ssrc_ == ssrc &&
- stats_.fraction_lost == fraction_loss &&
- stats_.cumulative_lost == cumulative_loss &&
- stats_.extended_max_sequence_number == extended_max &&
- stats_.jitter == jitter;
- }
-
- RtcpStatistics stats_;
- uint32_t ssrc_;
- } callback;
+ MockRtcpCallbackImpl callback;
rtcp_receiver_->RegisterRtcpStatisticsCallback(&callback);
@@ -1058,9 +1023,7 @@ TEST_F(RtcpReceiverTest, Callbacks) {
const uint32_t kJitter = 9;
const uint16_t kSequenceNumber = 1234;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
// First packet, all numbers should just propagate.
rtcp::ReportBlock rb1;
@@ -1073,14 +1036,21 @@ TEST_F(RtcpReceiverTest, Callbacks) {
rtcp::ReceiverReport rr1;
rr1.From(kSenderSsrc);
rr1.WithReportBlock(rb1);
- rtc::Buffer p1 = rr1.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p1.data(), p1.size()));
- EXPECT_TRUE(callback.Matches(kSourceSsrc, kSequenceNumber, kFractionLoss,
- kCumulativeLoss, kJitter));
+ EXPECT_CALL(
+ callback,
+ StatisticsUpdated(
+ AllOf(Field(&RtcpStatistics::fraction_lost, kFractionLoss),
+ Field(&RtcpStatistics::cumulative_lost, kCumulativeLoss),
+ Field(&RtcpStatistics::extended_max_sequence_number,
+ kSequenceNumber),
+ Field(&RtcpStatistics::jitter, kJitter)),
+ kSourceSsrc));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ InjectPacket(rr1);
rtcp_receiver_->RegisterRtcpStatisticsCallback(nullptr);
- // Add arbitrary numbers, callback should not be called (retain old values).
+ // Add arbitrary numbers, callback should not be called.
rtcp::ReportBlock rb2;
rb2.To(kSourceSsrc);
rb2.WithExtHighestSeqNum(kSequenceNumber + 1);
@@ -1091,41 +1061,37 @@ TEST_F(RtcpReceiverTest, Callbacks) {
rtcp::ReceiverReport rr2;
rr2.From(kSenderSsrc);
rr2.WithReportBlock(rb2);
- rtc::Buffer p2 = rr2.Build();
- EXPECT_EQ(0, InjectRtcpPacket(p2.data(), p2.size()));
- EXPECT_TRUE(callback.Matches(kSourceSsrc, kSequenceNumber, kFractionLoss,
- kCumulativeLoss, kJitter));
+ EXPECT_CALL(bandwidth_observer_, OnReceivedRtcpReceiverReport(_, _, _));
+ EXPECT_CALL(callback, StatisticsUpdated(_, _)).Times(0);
+ InjectPacket(rr2);
}
TEST_F(RtcpReceiverTest, ReceivesTransportFeedback) {
+ using rtcp::TransportFeedback;
const uint32_t kSenderSsrc = 0x10203;
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
- rtcp::TransportFeedback packet;
+ TransportFeedback packet;
packet.WithMediaSourceSsrc(kSourceSsrc);
packet.WithPacketSenderSsrc(kSenderSsrc);
packet.WithBase(1, 1000);
packet.WithReceivedPacket(1, 1000);
- rtc::Buffer built_packet = packet.Build();
-
- EXPECT_EQ(0, InjectRtcpPacket(built_packet.data(), built_packet.size()));
-
- EXPECT_NE(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpTransportFeedback);
- EXPECT_TRUE(rtcp_packet_info_.transport_feedback_.get() != nullptr);
+ EXPECT_CALL(
+ transport_feedback_observer_,
+ OnTransportFeedback(AllOf(
+ Property(&TransportFeedback::GetMediaSourceSsrc, kSourceSsrc),
+ Property(&TransportFeedback::GetPacketSenderSsrc, kSenderSsrc))));
+ InjectPacket(packet);
}
TEST_F(RtcpReceiverTest, HandlesInvalidTransportFeedback) {
const uint32_t kSenderSsrc = 0x10203;
const uint32_t kSourceSsrc = 0x123456;
- std::set<uint32_t> ssrcs;
- ssrcs.insert(kSourceSsrc);
- rtcp_receiver_->SetSsrcs(kSourceSsrc, ssrcs);
+ SetSsrc(kSourceSsrc);
// Send a compound packet with a TransportFeedback followed by something else.
rtcp::TransportFeedback packet;
@@ -1147,14 +1113,65 @@ TEST_F(RtcpReceiverTest, HandlesInvalidTransportFeedback) {
ByteWriter<uint16_t>::WriteBigEndian(
&built_packet.data()[kStatusCountOffset], 42);
- EXPECT_EQ(0, InjectRtcpPacket(built_packet.data(), built_packet.size()));
-
- // Transport feedback should be ignored, but next packet should work.
- EXPECT_EQ(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpTransportFeedback);
- EXPECT_NE(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpRemb);
- EXPECT_EQ(kBitrateBps, rtcp_packet_info_.receiverEstimatedMaxBitrate);
+ // Explicetly repeat that no tansport feedback callback is expected.
+ EXPECT_CALL(transport_feedback_observer_, OnTransportFeedback(_)).Times(0);
+ // But remb should be processed and cause a callback
+ EXPECT_CALL(bandwidth_observer_, OnReceivedEstimatedBitrate(kBitrateBps));
+ EXPECT_TRUE(rtcp_receiver_->IncomingPacket(built_packet.data(),
+ built_packet.size()));
}
-} // Anonymous namespace
+TEST_F(RtcpReceiverTest, Nack) {
+ const uint32_t kSenderSsrc = 0x10203;
+ const uint32_t kSourceSsrc = 0x123456;
+ const uint16_t kNackList1[] = {1, 2, 3, 5};
+ const size_t kNackListLength1 = std::end(kNackList1) - std::begin(kNackList1);
+ const uint16_t kNackList2[] = {5, 7, 30, 40};
+ const size_t kNackListLength2 = std::end(kNackList2) - std::begin(kNackList2);
+ SetSsrc(kSourceSsrc);
+
+ rtcp::Nack nack;
+ nack.From(kSenderSsrc);
+ nack.To(kSourceSsrc);
+ nack.WithList(kNackList1, kNackListLength1);
+
+ EXPECT_CALL(
+ packet_type_counter_observer_,
+ RtcpPacketTypesCounterUpdated(
+ kSourceSsrc,
+ AllOf(Field(&RtcpPacketTypeCounter::nack_requests, 4),
+ Field(&RtcpPacketTypeCounter::unique_nack_requests, 4))));
+ InjectPacket(nack);
+
+ rtcp::Nack nack2;
+ nack2.From(kSenderSsrc);
+ nack2.To(kSourceSsrc);
+ nack2.WithList(kNackList2, kNackListLength2);
+ EXPECT_CALL(
+ packet_type_counter_observer_,
+ RtcpPacketTypesCounterUpdated(
+ kSourceSsrc,
+ AllOf(Field(&RtcpPacketTypeCounter::nack_requests, 8),
+ Field(&RtcpPacketTypeCounter::unique_nack_requests, 7))));
+ InjectPacket(nack2);
+}
+TEST_F(RtcpReceiverTest, NackNotForUsIgnored) {
+ const uint32_t kSenderSsrc = 0x10203;
+ const uint32_t kSourceSsrc = 0x123456;
+ const uint16_t kNackList1[] = {1, 2, 3, 5};
+ const size_t kNackListLength1 = std::end(kNackList1) - std::begin(kNackList1);
+ SetSsrc(kSourceSsrc);
+
+ rtcp::Nack nack;
+ nack.From(kSenderSsrc);
+ nack.To(kSourceSsrc + 1);
+ nack.WithList(kNackList1, kNackListLength1);
+
+ EXPECT_CALL(packet_type_counter_observer_,
+ RtcpPacketTypesCounterUpdated(
+ _, Field(&RtcpPacketTypeCounter::nack_requests, 0)));
+ InjectPacket(nack);
+}
+// TODO(danilchap): Add test for SendReportRequest experemental packet.
} // namespace webrtc
« webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc ('K') | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698