Use RtcpPacket classes for SenderReport/ReceiveReport in RTCPSender

webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  * This file includes unit tests for the RtcpPacket.
@@ skipping 53 matching lines @@
   rb.To(kRemoteSsrc);
   rb.WithFractionLost(55);
   rb.WithCumulativeLost(0x111111);
   rb.WithExtHighestSeqNum(0x22222222);
   rb.WithJitter(0x33333333);
   rb.WithLastSr(0x44444444);
   rb.WithDelayLastSr(0x55555555);
 
   ReceiverReport rr;
   rr.From(kSenderSsrc);
-  EXPECT_TRUE(rr.WithReportBlock(&rb));
+  EXPECT_TRUE(rr.WithReportBlock(rb));
 
   rtc::scoped_ptr<RawPacket> packet(rr.Build());
   RtcpPacketParser parser;
   parser.Parse(packet->Buffer(), packet->Length());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
   EXPECT_EQ(kSenderSsrc, parser.receiver_report()->Ssrc());
   EXPECT_EQ(1, parser.report_block()->num_packets());
   EXPECT_EQ(kRemoteSsrc, parser.report_block()->Ssrc());
   EXPECT_EQ(55U, parser.report_block()->FractionLost());
   EXPECT_EQ(0x111111U, parser.report_block()->CumPacketLost());
   EXPECT_EQ(0x22222222U, parser.report_block()->ExtHighestSeqNum());
   EXPECT_EQ(0x33333333U, parser.report_block()->Jitter());
   EXPECT_EQ(0x44444444U, parser.report_block()->LastSr());
   EXPECT_EQ(0x55555555U, parser.report_block()->DelayLastSr());
 }
 
 TEST(RtcpPacketTest, RrWithTwoReportBlocks) {
   ReportBlock rb1;
   rb1.To(kRemoteSsrc);
   ReportBlock rb2;
   rb2.To(kRemoteSsrc + 1);
 
   ReceiverReport rr;
   rr.From(kSenderSsrc);
-  EXPECT_TRUE(rr.WithReportBlock(&rb1));
-  EXPECT_TRUE(rr.WithReportBlock(&rb2));
+  EXPECT_TRUE(rr.WithReportBlock(rb1));
+  EXPECT_TRUE(rr.WithReportBlock(rb2));
 
   rtc::scoped_ptr<RawPacket> packet(rr.Build());
   RtcpPacketParser parser;
   parser.Parse(packet->Buffer(), packet->Length());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
   EXPECT_EQ(kSenderSsrc, parser.receiver_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, RrWithTooManyReportBlocks) {
   ReceiverReport rr;
   rr.From(kSenderSsrc);
   const int kMaxReportBlocks = (1 << 5) - 1;
   ReportBlock rb;
   for (int i = 0; i < kMaxReportBlocks; ++i) {
     rb.To(kRemoteSsrc + i);
-    EXPECT_TRUE(rr.WithReportBlock(&rb));
+    EXPECT_TRUE(rr.WithReportBlock(rb));
   }
   rb.To(kRemoteSsrc + kMaxReportBlocks);
-  EXPECT_FALSE(rr.WithReportBlock(&rb));
+  EXPECT_FALSE(rr.WithReportBlock(rb));
 }
 
 TEST(RtcpPacketTest, Sr) {
   SenderReport sr;
   sr.From(kSenderSsrc);
   sr.WithNtpSec(0x11111111);
   sr.WithNtpFrac(0x22222222);
   sr.WithRtpTimestamp(0x33333333);
   sr.WithPacketCount(0x44444444);
   sr.WithOctetCount(0x55555555);
@@ skipping 11 matching lines @@
   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));
+  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));
+  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));
+    EXPECT_TRUE(sr.WithReportBlock(rb));
   }
   rb.To(kRemoteSsrc + kMaxReportBlocks);
-  EXPECT_FALSE(sr.WithReportBlock(&rb));
+  EXPECT_FALSE(sr.WithReportBlock(rb));
 }
 
 TEST(RtcpPacketTest, IjNoItem) {
   Ij ij;
 
   rtc::scoped_ptr<RawPacket> packet(ij.Build());
   RtcpPacketParser parser;
   parser.Parse(packet->Buffer(), packet->Length());
   EXPECT_EQ(1, parser.ij()->num_packets());
   EXPECT_EQ(0, parser.ij_item()->num_packets());
@@ skipping 353 matching lines @@
   EXPECT_EQ(1, parser.fir_item()->num_packets());
   EXPECT_EQ(kRemoteSsrc, parser.fir_item()->Ssrc());
   EXPECT_EQ(123U, parser.fir_item()->SeqNum());
 }
 
 TEST(RtcpPacketTest, AppendPacket) {
   Fir fir;
   ReportBlock rb;
   ReceiverReport rr;
   rr.From(kSenderSsrc);
-  EXPECT_TRUE(rr.WithReportBlock(&rb));
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   rr.Append(&fir);
 
   rtc::scoped_ptr<RawPacket> packet(rr.Build());
   RtcpPacketParser parser;
   parser.Parse(packet->Buffer(), packet->Length());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
   EXPECT_EQ(kSenderSsrc, parser.receiver_report()->Ssrc());
   EXPECT_EQ(1, parser.report_block()->num_packets());
   EXPECT_EQ(1, parser.fir()->num_packets());
 }
@@ skipping 10 matching lines @@
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
   EXPECT_EQ(0, parser.report_block()->num_packets());
 }
 
 TEST(RtcpPacketTest, AppendPacketWithOwnAppendedPacket) {
   Fir fir;
   Bye bye;
   ReportBlock rb;
 
   ReceiverReport rr;
-  EXPECT_TRUE(rr.WithReportBlock(&rb));
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   rr.Append(&fir);
 
   SenderReport sr;
   sr.Append(&bye);
   sr.Append(&rr);
 
   rtc::scoped_ptr<RawPacket> packet(sr.Build());
   RtcpPacketParser parser;
   parser.Parse(packet->Buffer(), packet->Length());
   EXPECT_EQ(1, parser.sender_report()->num_packets());
@@ skipping 38 matching lines @@
     EXPECT_TRUE(bye.WithCsrc(i));
   }
   EXPECT_FALSE(bye.WithCsrc(kMaxCsrcs));
 }
 
 TEST(RtcpPacketTest, BuildWithInputBuffer) {
   Fir fir;
   ReportBlock rb;
   ReceiverReport rr;
   rr.From(kSenderSsrc);
-  EXPECT_TRUE(rr.WithReportBlock(&rb));
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   rr.Append(&fir);
 
   const size_t kRrLength = 8;
   const size_t kReportBlockLength = 24;
   const size_t kFirLength = 20;
 
   class Verifier : public rtcp::RtcpPacket::PacketReadyCallback {
    public:
     void OnPacketReady(uint8_t* data, size_t length) override {
       RtcpPacketParser parser;
       parser.Parse(data, length);
       EXPECT_EQ(1, parser.receiver_report()->num_packets());
       EXPECT_EQ(1, parser.report_block()->num_packets());
       EXPECT_EQ(1, parser.fir()->num_packets());
       ++packets_created_;
     }
 
     int packets_created_ = 0;
   } verifier;
   const size_t kBufferSize = kRrLength + kReportBlockLength + kFirLength;
   uint8_t buffer[kBufferSize];
   EXPECT_TRUE(rr.BuildExternalBuffer(buffer, kBufferSize, &verifier));
   EXPECT_EQ(1, verifier.packets_created_);
 }
 
 TEST(RtcpPacketTest, BuildWithTooSmallBuffer) {
   ReportBlock rb;
   ReceiverReport rr;
   rr.From(kSenderSsrc);
-  EXPECT_TRUE(rr.WithReportBlock(&rb));
+  EXPECT_TRUE(rr.WithReportBlock(rb));
 
   const size_t kRrLength = 8;
   const size_t kReportBlockLength = 24;
 
   // No packet.
   class Verifier : public rtcp::RtcpPacket::PacketReadyCallback {
     void OnPacketReady(uint8_t* data, size_t length) override {
       ADD_FAILURE() << "Packet should not fit within max size.";
     }
   } verifier;
   const size_t kBufferSize = kRrLength + kReportBlockLength - 1;
   uint8_t buffer[kBufferSize];
   EXPECT_FALSE(rr.BuildExternalBuffer(buffer, kBufferSize, &verifier));
 }
 
 TEST(RtcpPacketTest, BuildWithTooSmallBuffer_FragmentedSend) {
   Fir fir;
   ReportBlock rb;
   ReceiverReport rr;
   rr.From(kSenderSsrc);
-  EXPECT_TRUE(rr.WithReportBlock(&rb));
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   rr.Append(&fir);
 
   const size_t kRrLength = 8;
   const size_t kReportBlockLength = 24;
 
   class Verifier : public rtcp::RtcpPacket::PacketReadyCallback {
    public:
     void OnPacketReady(uint8_t* data, size_t length) override {
       RtcpPacketParser parser;
       parser.Parse(data, length);
@@ skipping 356 matching lines @@
   for (int i = 0; i < kMaxBlocks; ++i)
     EXPECT_TRUE(xr.WithDlrr(&dlrr));
   EXPECT_FALSE(xr.WithDlrr(&dlrr));
 
   VoipMetric voip_metric;
   for (int i = 0; i < kMaxBlocks; ++i)
     EXPECT_TRUE(xr.WithVoipMetric(&voip_metric));
   EXPECT_FALSE(xr.WithVoipMetric(&voip_metric));
 }
 }  // namespace webrtc