cast: cleanup rtp header and parsing

media/cast/net/rtp/rtp_packetizer_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/net/rtp/rtp_packetizer.h"
 
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/logging/logging_impl.h"
 #include "media/cast/logging/simple_event_subscriber.h"
 #include "media/cast/net/pacing/paced_sender.h"
 #include "media/cast/net/rtp/packet_storage.h"
-#include "media/cast/net/rtp/rtp_header_parser.h"
+#include "media/cast/net/rtp/rtp_parser.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 static const int kPayload = 127;
 static const uint32 kTimestampMs = 10;
 static const uint16 kSeqNum = 33;
 static const int kMaxPacketLength = 1500;
 static const int kSsrc = 0x12345;
 static const unsigned int kFrameSize = 5000;
 }
 
 class TestRtpPacketTransport : public PacketSender {
  public:
   explicit TestRtpPacketTransport(RtpPacketizerConfig config)
       : config_(config),
         sequence_number_(kSeqNum),
         packets_sent_(0),
         expected_number_of_packets_(0),
         expected_packet_id_(0),
         expected_frame_id_(0),
         expected_rtp_timestamp_(0) {}
 
-  void VerifyRtpHeader(const RtpCastTestHeader& rtp_header) {
+  void VerifyRtpHeader(const RtpCastHeader& rtp_header) {
     VerifyCommonRtpHeader(rtp_header);
     VerifyCastRtpHeader(rtp_header);
   }
 
-  void VerifyCommonRtpHeader(const RtpCastTestHeader& rtp_header) {
+  void VerifyCommonRtpHeader(const RtpCastHeader& rtp_header) {
     EXPECT_EQ(kPayload, rtp_header.payload_type);
     EXPECT_EQ(sequence_number_, rtp_header.sequence_number);
     EXPECT_EQ(expected_rtp_timestamp_, rtp_header.rtp_timestamp);
-    EXPECT_EQ(config_.ssrc, rtp_header.ssrc);
+    EXPECT_EQ(config_.ssrc, rtp_header.sender_ssrc);
     EXPECT_EQ(0, rtp_header.num_csrcs);
   }
 
-  void VerifyCastRtpHeader(const RtpCastTestHeader& rtp_header) {
+  void VerifyCastRtpHeader(const RtpCastHeader& rtp_header) {
     EXPECT_FALSE(rtp_header.is_key_frame);
     EXPECT_EQ(expected_frame_id_, rtp_header.frame_id);
     EXPECT_EQ(expected_packet_id_, rtp_header.packet_id);
     EXPECT_EQ(expected_number_of_packets_ - 1, rtp_header.max_packet_id);
     EXPECT_TRUE(rtp_header.is_reference);
     EXPECT_EQ(expected_frame_id_ - 1u, rtp_header.reference_frame_id);
   }
 
   bool SendPacket(PacketRef packet, const base::Closure& cb) final {
     ++packets_sent_;
-    RtpHeaderParser parser(&packet->data[0], packet->data.size());
-    RtpCastTestHeader rtp_header;
-    parser.Parse(&rtp_header);
+    RtpParser parser(kSsrc, kPayload);
+    RtpCastHeader rtp_header;
+    const uint8* payload_data;
+    size_t payload_size;
+    parser.ParsePacket(&packet->data[0], packet->data.size(), &rtp_header,
+                       &payload_data, &payload_size);
     VerifyRtpHeader(rtp_header);
     ++sequence_number_;
     ++expected_packet_id_;
     return true;
   }
 
   int64 GetBytesSent() final { return 0; }
 
   size_t number_of_packets_received() const { return packets_sent_; }
 
   void set_expected_number_of_packets(size_t expected_number_of_packets) {
     expected_number_of_packets_ = expected_number_of_packets;
   }
 
   void set_rtp_timestamp(uint32 rtp_timestamp) {
     expected_rtp_timestamp_ = rtp_timestamp;
   }
 
   RtpPacketizerConfig config_;
   uint32 sequence_number_;
   size_t packets_sent_;
   size_t number_of_packets_;
   size_t expected_number_of_packets_;
   // Assuming packets arrive in sequence.
   int expected_packet_id_;
   uint32 expected_frame_id_;
   uint32 expected_rtp_timestamp_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(TestRtpPacketTransport);
 };
 
 class RtpPacketizerTest : public ::testing::Test {
  protected:
   RtpPacketizerTest()
       : task_runner_(new test::FakeSingleThreadTaskRunner(&testing_clock_)) {
     config_.sequence_number = kSeqNum;
     config_.ssrc = kSsrc;
     config_.payload_type = kPayload;
@@ skipping 26 matching lines @@
   base::SimpleTestTickClock testing_clock_;
   scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   EncodedFrame video_frame_;
   PacketStorage packet_storage_;
   RtpPacketizerConfig config_;
   scoped_ptr<TestRtpPacketTransport> transport_;
   LoggingImpl logging_;
   scoped_ptr<PacedSender> pacer_;
   scoped_ptr<RtpPacketizer> rtp_packetizer_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(RtpPacketizerTest);
 };
 
 TEST_F(RtpPacketizerTest, SendStandardPackets) {
   size_t expected_num_of_packets = kFrameSize / kMaxPacketLength + 1;
   transport_->set_expected_number_of_packets(expected_num_of_packets);
   transport_->set_rtp_timestamp(video_frame_.rtp_timestamp);
 
   testing_clock_.Advance(base::TimeDelta::FromMilliseconds(kTimestampMs));
   video_frame_.reference_time = testing_clock_.NowTicks();
@@ skipping 14 matching lines @@
   video_frame_.reference_time = testing_clock_.NowTicks();
   rtp_packetizer_->SendFrameAsPackets(video_frame_);
   RunTasks(33 + 1);
   EXPECT_EQ(expected_num_of_packets, rtp_packetizer_->send_packet_count());
   EXPECT_EQ(kFrameSize, rtp_packetizer_->send_octet_count());
   EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received());
 }
 
 }  // namespace cast
 }  // namespace media