Index: webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc |
index 78b0523d8dd10a4a0c4789b7fc7aacf448a0bd47..f9c609983d4332c7cdc8bddf17eb458795b1957a 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc |
@@ -17,6 +17,7 @@ |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" |
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" |
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" |
#include "webrtc/test/rtcp_packet_parser.h" |
using ::testing::ElementsAre; |
@@ -46,80 +47,6 @@ namespace webrtc { |
const uint32_t kSenderSsrc = 0x12345678; |
const uint32_t kRemoteSsrc = 0x23456789; |
-TEST(RtcpPacketTest, Sr) { |
- SenderReport sr; |
- sr.From(kSenderSsrc); |
- sr.WithNtpSec(0x11111111); |
- sr.WithNtpFrac(0x22222222); |
- sr.WithRtpTimestamp(0x33333333); |
- sr.WithPacketCount(0x44444444); |
- sr.WithOctetCount(0x55555555); |
- |
- rtc::scoped_ptr<RawPacket> packet(sr.Build()); |
- RtcpPacketParser parser; |
- parser.Parse(packet->Buffer(), packet->Length()); |
- |
- EXPECT_EQ(1, parser.sender_report()->num_packets()); |
- EXPECT_EQ(kSenderSsrc, parser.sender_report()->Ssrc()); |
- EXPECT_EQ(0x11111111U, parser.sender_report()->NtpSec()); |
- EXPECT_EQ(0x22222222U, parser.sender_report()->NtpFrac()); |
- EXPECT_EQ(0x33333333U, parser.sender_report()->RtpTimestamp()); |
- EXPECT_EQ(0x44444444U, parser.sender_report()->PacketCount()); |
- EXPECT_EQ(0x55555555U, parser.sender_report()->OctetCount()); |
- EXPECT_EQ(0, parser.report_block()->num_packets()); |
-} |
- |
-TEST(RtcpPacketTest, SrWithOneReportBlock) { |
- ReportBlock rb; |
- rb.To(kRemoteSsrc); |
- |
- SenderReport sr; |
- sr.From(kSenderSsrc); |
- EXPECT_TRUE(sr.WithReportBlock(rb)); |
- |
- rtc::scoped_ptr<RawPacket> packet(sr.Build()); |
- RtcpPacketParser parser; |
- parser.Parse(packet->Buffer(), packet->Length()); |
- EXPECT_EQ(1, parser.sender_report()->num_packets()); |
- EXPECT_EQ(kSenderSsrc, parser.sender_report()->Ssrc()); |
- EXPECT_EQ(1, parser.report_block()->num_packets()); |
- EXPECT_EQ(kRemoteSsrc, parser.report_block()->Ssrc()); |
-} |
- |
-TEST(RtcpPacketTest, SrWithTwoReportBlocks) { |
- ReportBlock rb1; |
- rb1.To(kRemoteSsrc); |
- ReportBlock rb2; |
- rb2.To(kRemoteSsrc + 1); |
- |
- SenderReport sr; |
- sr.From(kSenderSsrc); |
- EXPECT_TRUE(sr.WithReportBlock(rb1)); |
- EXPECT_TRUE(sr.WithReportBlock(rb2)); |
- |
- rtc::scoped_ptr<RawPacket> packet(sr.Build()); |
- RtcpPacketParser parser; |
- parser.Parse(packet->Buffer(), packet->Length()); |
- EXPECT_EQ(1, parser.sender_report()->num_packets()); |
- EXPECT_EQ(kSenderSsrc, parser.sender_report()->Ssrc()); |
- EXPECT_EQ(2, parser.report_block()->num_packets()); |
- EXPECT_EQ(1, parser.report_blocks_per_ssrc(kRemoteSsrc)); |
- EXPECT_EQ(1, parser.report_blocks_per_ssrc(kRemoteSsrc + 1)); |
-} |
- |
-TEST(RtcpPacketTest, SrWithTooManyReportBlocks) { |
- SenderReport sr; |
- sr.From(kSenderSsrc); |
- const int kMaxReportBlocks = (1 << 5) - 1; |
- ReportBlock rb; |
- for (int i = 0; i < kMaxReportBlocks; ++i) { |
- rb.To(kRemoteSsrc + i); |
- EXPECT_TRUE(sr.WithReportBlock(rb)); |
- } |
- rb.To(kRemoteSsrc + kMaxReportBlocks); |
- EXPECT_FALSE(sr.WithReportBlock(rb)); |
-} |
- |
TEST(RtcpPacketTest, AppWithNoData) { |
App app; |
app.WithSubType(30); |