Removed RTPHeader from NetEq's Packet struct.

webrtc/modules/audio_coding/neteq/timestamp_scaler_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 163 matching lines @@
   const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory);
   static const uint8_t kRtpPayloadType = 17;
   EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType))
       .WillRepeatedly(Return(&info));
 
   TimestampScaler scaler(db);
   // Test both sides of the timestamp wrap-around.
   uint32_t external_timestamp = 0xFFFFFFFF - 5;
   uint32_t internal_timestamp = external_timestamp;
   Packet packet;
-  packet.header.payloadType = kRtpPayloadType;
+  packet.payloadType = kRtpPayloadType;
   for (; external_timestamp != 5; ++external_timestamp) {
-    packet.header.timestamp = external_timestamp;
+    packet.timestamp = external_timestamp;
     // Scale to internal timestamp.
     scaler.ToInternal(&packet);
-    EXPECT_EQ(internal_timestamp, packet.header.timestamp);
+    EXPECT_EQ(internal_timestamp, packet.timestamp);
     internal_timestamp += 2;
   }
 
   EXPECT_CALL(db, Die());  // Called when database object is deleted.
 }
 
 // Make sure that the method ToInternal(PacketList* packet_list) is wired up
 // correctly. Since it is simply calling the ToInternal(Packet* packet) method,
 // we are not doing as many tests here.
 TEST(TimestampScaler, TestG722PacketList) {
   MockDecoderDatabase db;
   auto factory = CreateBuiltinAudioDecoderFactory();
   // Use G722, which has a factor 2 scaling.
   const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory);
   static const uint8_t kRtpPayloadType = 17;
   EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType))
       .WillRepeatedly(Return(&info));
 
   TimestampScaler scaler(db);
   // Test both sides of the timestamp wrap-around.
   uint32_t external_timestamp = 0xFFFFFFFF - 5;
   uint32_t internal_timestamp = external_timestamp;
   Packet packet1;
-  packet1.header.payloadType = kRtpPayloadType;
-  packet1.header.timestamp = external_timestamp;
+  packet1.payloadType = kRtpPayloadType;
+  packet1.timestamp = external_timestamp;
   Packet packet2;
-  packet2.header.payloadType = kRtpPayloadType;
-  packet2.header.timestamp = external_timestamp + 10;
+  packet2.payloadType = kRtpPayloadType;
+  packet2.timestamp = external_timestamp + 10;
   PacketList packet_list;
   packet_list.push_back(&packet1);
   packet_list.push_back(&packet2);
 
   scaler.ToInternal(&packet_list);
-  EXPECT_EQ(internal_timestamp, packet1.header.timestamp);
-  EXPECT_EQ(internal_timestamp + 20, packet2.header.timestamp);
+  EXPECT_EQ(internal_timestamp, packet1.timestamp);
+  EXPECT_EQ(internal_timestamp + 20, packet2.timestamp);
 
   EXPECT_CALL(db, Die());  // Called when database object is deleted.
 }
 
 TEST(TimestampScaler, TestG722Reset) {
   MockDecoderDatabase db;
   auto factory = CreateBuiltinAudioDecoderFactory();
   // Use G722, which has a factor 2 scaling.
   const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory);
   static const uint8_t kRtpPayloadType = 17;
@@ skipping 69 matching lines @@
   uint32_t timestamp = 4711;  // Some number.
   EXPECT_EQ(timestamp, scaler.ToInternal(timestamp, kRtpPayloadType));
 
   Packet* packet = NULL;
   scaler.ToInternal(packet);  // Should not crash. That's all we can test.
 
   EXPECT_CALL(db, Die());  // Called when database object is deleted.
 }
 
 }  // namespace webrtc