Removed RTPHeader from NetEq's Packet struct.

webrtc/modules/audio_coding/neteq/red_payload_splitter_unittest.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 62 matching lines @@
 
 // Creates a RED packet, with |num_payloads| payloads, with payload types given
 // by the values in array |payload_types| (which must be of length
 // |num_payloads|). Each redundant payload is |timestamp_offset| samples
 // "behind" the the previous payload.
 Packet* CreateRedPayload(size_t num_payloads,
                          uint8_t* payload_types,
                          int timestamp_offset,
                          bool embed_opus_fec = false) {
   Packet* packet = new Packet;
-  packet->header.payloadType = kRedPayloadType;
-  packet->header.timestamp = kBaseTimestamp;
-  packet->header.sequenceNumber = kSequenceNumber;
+  packet->payload_type = kRedPayloadType;
+  packet->timestamp = kBaseTimestamp;
+  packet->sequence_number = kSequenceNumber;
   packet->payload.SetSize((kPayloadLength + 1) +
                           (num_payloads - 1) *
                               (kPayloadLength + kRedHeaderLength));
   uint8_t* payload_ptr = packet->payload.data();
   for (size_t i = 0; i < num_payloads; ++i) {
     // Write the RED headers.
     if (i == num_payloads - 1) {
       // Special case for last payload.
       *payload_ptr = payload_types[i] & 0x7F;  // F = 0;
       ++payload_ptr;
@@ skipping 24 matching lines @@
   }
   return packet;
 }
 
 // Create a packet with all payload bytes set to |payload_value|.
 Packet* CreatePacket(uint8_t payload_type,
                      size_t payload_length,
                      uint8_t payload_value,
                      bool opus_fec = false) {
   Packet* packet = new Packet;
-  packet->header.payloadType = payload_type;
-  packet->header.timestamp = kBaseTimestamp;
-  packet->header.sequenceNumber = kSequenceNumber;
+  packet->payload_type = payload_type;
+  packet->timestamp = kBaseTimestamp;
+  packet->sequence_number = kSequenceNumber;
   packet->payload.SetSize(payload_length);
   if (opus_fec) {
     CreateOpusFecPayload(packet->payload.data(), packet->payload.size(),
                          payload_value);
   } else {
     memset(packet->payload.data(), payload_value, packet->payload.size());
   }
   return packet;
 }
 
 // Checks that |packet| has the attributes given in the remaining parameters.
 void VerifyPacket(const Packet* packet,
                   size_t payload_length,
                   uint8_t payload_type,
                   uint16_t sequence_number,
                   uint32_t timestamp,
                   uint8_t payload_value,
                   Packet::Priority priority) {
   EXPECT_EQ(payload_length, packet->payload.size());
-  EXPECT_EQ(payload_type, packet->header.payloadType);
-  EXPECT_EQ(sequence_number, packet->header.sequenceNumber);
-  EXPECT_EQ(timestamp, packet->header.timestamp);
+  EXPECT_EQ(payload_type, packet->payload_type);
+  EXPECT_EQ(sequence_number, packet->sequence_number);
+  EXPECT_EQ(timestamp, packet->timestamp);
   EXPECT_EQ(priority, packet->priority);
   ASSERT_FALSE(packet->payload.empty());
   for (size_t i = 0; i < packet->payload.size(); ++i) {
     ASSERT_EQ(payload_value, packet->payload.data()[i]);
   }
 }
 
 void VerifyPacket(const Packet* packet,
                   size_t payload_length,
                   uint8_t payload_type,
@@ skipping 41 matching lines @@
 TEST(RedPayloadSplitter, TwoPacketsOnePayload) {
   uint8_t payload_types[] = {0};
   const int kTimestampOffset = 160;
   // Create first packet, with a single RED payload.
   Packet* packet = CreateRedPayload(1, payload_types, kTimestampOffset);
   PacketList packet_list;
   packet_list.push_back(packet);
   // Create second packet, with a single RED payload.
   packet = CreateRedPayload(1, payload_types, kTimestampOffset);
   // Manually change timestamp and sequence number of second packet.
-  packet->header.timestamp += kTimestampOffset;
-  packet->header.sequenceNumber++;
+  packet->timestamp += kTimestampOffset;
+  packet->sequence_number++;
   packet_list.push_back(packet);
   RedPayloadSplitter splitter;
   EXPECT_TRUE(splitter.SplitRed(&packet_list));
   ASSERT_EQ(2u, packet_list.size());
   // Check first packet.
   packet = packet_list.front();
   VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber,
                kBaseTimestamp, 0, true);
   delete packet;
   packet_list.pop_front();
@@ skipping 16 matching lines @@
 TEST(RedPayloadSplitter, TwoPacketsThreePayloads) {
   uint8_t payload_types[] = {2, 1, 0};  // Primary is the last one.
   const int kTimestampOffset = 160;
   // Create first packet, with 3 RED payloads.
   Packet* packet = CreateRedPayload(3, payload_types, kTimestampOffset);
   PacketList packet_list;
   packet_list.push_back(packet);
   // Create first packet, with 3 RED payloads.
   packet = CreateRedPayload(3, payload_types, kTimestampOffset);
   // Manually change timestamp and sequence number of second packet.
-  packet->header.timestamp += kTimestampOffset;
-  packet->header.sequenceNumber++;
+  packet->timestamp += kTimestampOffset;
+  packet->sequence_number++;
   packet_list.push_back(packet);
   RedPayloadSplitter splitter;
   EXPECT_TRUE(splitter.SplitRed(&packet_list));
   ASSERT_EQ(6u, packet_list.size());
   // Check first packet, A1.
   packet = packet_list.front();
   VerifyPacket(packet, kPayloadLength, payload_types[2], kSequenceNumber,
                kBaseTimestamp, 2, {0, 0});
   delete packet;
   packet_list.pop_front();
@@ skipping 86 matching lines @@
   ASSERT_EQ(1u, packet_list.size());
   // Check first packet.
   packet = packet_list.front();
   VerifyPacket(packet, kPayloadLength, payload_types[0], kSequenceNumber,
                kBaseTimestamp - 2 * kTimestampOffset, 0, {0, 2});
   delete packet;
   packet_list.pop_front();
 }
 
 }  // namespace webrtc