Moved Opus-specific payload splitting into AudioDecoderOpus.

webrtc/modules/audio_coding/neteq/packet_buffer_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 42 matching lines @@
 
 Packet* PacketGenerator::NextPacket(int payload_size_bytes) {
   Packet* packet = new Packet;
   packet->header.sequenceNumber = seq_no_;
   packet->header.timestamp = ts_;
   packet->header.payloadType = pt_;
   packet->header.markerBit = false;
   packet->header.ssrc = 0x12345678;
   packet->header.numCSRCs = 0;
   packet->header.paddingLength = 0;
-  packet->primary = true;
   packet->payload.SetSize(payload_size_bytes);
   ++seq_no_;
   ts_ += frame_size_;
   return packet;
 }
 
 struct PacketsToInsert {
   uint16_t sequence_number;
   uint32_t timestamp;
   uint8_t payload_type;
@@ skipping 203 matching lines @@
   std::vector<Packet*> expect_order(kExpectPacketsInBuffer);
 
   PacketGenerator gen(0, 0, 0, kFrameSize);
 
   for (int i = 0; i < kPackets; ++i) {
     gen.Reset(packet_facts[i].sequence_number,
               packet_facts[i].timestamp,
               packet_facts[i].payload_type,
               kFrameSize);
     Packet* packet = gen.NextPacket(kPayloadLength);
-    packet->primary = packet_facts[i].primary;
+    packet->priority.red_level = packet_facts[i].primary ? 0 : 1;
     EXPECT_EQ(PacketBuffer::kOK, buffer.InsertPacket(packet));
     if (packet_facts[i].extract_order >= 0) {
       expect_order[packet_facts[i].extract_order] = packet;
     }
   }
 
   EXPECT_EQ(kExpectPacketsInBuffer, buffer.NumPacketsInBuffer());
 
   size_t drop_count;
   for (size_t i = 0; i < kExpectPacketsInBuffer; ++i) {
@@ skipping 207 matching lines @@
   EXPECT_TRUE(list.empty());  // The PacketBuffer should have depleted the list.
   EXPECT_EQ(1u, buffer->NumPacketsInBuffer());
   delete buffer;
   EXPECT_CALL(decoder_database, Die());  // Called when object is deleted.
 }
 
 // Test packet comparison function.
 // The function should return true if the first packet "goes before" the second.
 TEST(PacketBuffer, ComparePackets) {
   PacketGenerator gen(0, 0, 0, 10);
-  Packet* a = gen.NextPacket(10);  // SN = 0, TS = 0.
-  Packet* b = gen.NextPacket(10);  // SN = 1, TS = 10.
+  std::unique_ptr<Packet> a(gen.NextPacket(10));  // SN = 0, TS = 0.
+  std::unique_ptr<Packet> b(gen.NextPacket(10));  // SN = 1, TS = 10.
   EXPECT_FALSE(*a == *b);
   EXPECT_TRUE(*a != *b);
   EXPECT_TRUE(*a < *b);
   EXPECT_FALSE(*a > *b);
   EXPECT_TRUE(*a <= *b);
   EXPECT_FALSE(*a >= *b);
 
   // Testing wrap-around case; 'a' is earlier but has a larger timestamp value.
   a->header.timestamp = 0xFFFFFFFF - 10;
   EXPECT_FALSE(*a == *b);
@@ skipping 22 matching lines @@
 
   // Test equal timestamps but different sequence numbers (32767 and 1).
   a->header.sequenceNumber = 0xFFFF;
   EXPECT_FALSE(*a == *b);
   EXPECT_TRUE(*a != *b);
   EXPECT_TRUE(*a < *b);
   EXPECT_FALSE(*a > *b);
   EXPECT_TRUE(*a <= *b);
   EXPECT_FALSE(*a >= *b);
 
-  // Test equal timestamps and sequence numbers, but only 'b' is primary.
+  // Test equal timestamps and sequence numbers, but differing priorities.
   a->header.sequenceNumber = b->header.sequenceNumber;
-  a->primary = false;
-  b->primary = true;
+  a->priority = {1, 0};
+  b->priority = {0, 0};
+  // a after b
   EXPECT_FALSE(*a == *b);
   EXPECT_TRUE(*a != *b);
   EXPECT_FALSE(*a < *b);
   EXPECT_TRUE(*a > *b);
   EXPECT_FALSE(*a <= *b);
   EXPECT_TRUE(*a >= *b);
 
-  delete a;
-  delete b;
+  std::unique_ptr<Packet> c(gen.NextPacket(0));  // SN = 2, TS = 20.
+  std::unique_ptr<Packet> d(gen.NextPacket(0));  // SN = 3, TS = 20.
+  c->header.timestamp = b->header.timestamp;
+  d->header.timestamp = b->header.timestamp;
+  c->header.sequenceNumber = b->header.sequenceNumber;
+  d->header.sequenceNumber = b->header.sequenceNumber;
+  c->priority = {1, 1};
+  d->priority = {0, 1};
+  // c after d
+  EXPECT_FALSE(*c == *d);
+  EXPECT_TRUE(*c != *d);
+  EXPECT_FALSE(*c < *d);
+  EXPECT_TRUE(*c > *d);
+  EXPECT_FALSE(*c <= *d);
+  EXPECT_TRUE(*c >= *d);
+
+  // c after a
+  EXPECT_FALSE(*c == *a);
+  EXPECT_TRUE(*c != *a);
+  EXPECT_FALSE(*c < *a);
+  EXPECT_TRUE(*c > *a);
+  EXPECT_FALSE(*c <= *a);
+  EXPECT_TRUE(*c >= *a);
+
+  // c after b
+  EXPECT_FALSE(*c == *b);
+  EXPECT_TRUE(*c != *b);
+  EXPECT_FALSE(*c < *b);
+  EXPECT_TRUE(*c > *b);
+  EXPECT_FALSE(*c <= *b);
+  EXPECT_TRUE(*c >= *b);
+
+  // a after d
+  EXPECT_FALSE(*a == *d);
+  EXPECT_TRUE(*a != *d);
+  EXPECT_FALSE(*a < *d);
+  EXPECT_TRUE(*a > *d);
+  EXPECT_FALSE(*a <= *d);
+  EXPECT_TRUE(*a >= *d);
+
+  // d after b
+  EXPECT_FALSE(*d == *b);
+  EXPECT_TRUE(*d != *b);
+  EXPECT_FALSE(*d < *b);
+  EXPECT_TRUE(*d > *b);
+  EXPECT_FALSE(*d <= *b);
+  EXPECT_TRUE(*d >= *b);
 }
 
 // Test the DeleteFirstPacket DeleteAllPackets methods.
 TEST(PacketBuffer, DeleteAllPackets) {
   PacketGenerator gen(0, 0, 0, 10);
   PacketList list;
   const int payload_len = 10;
 
   // Insert 10 small packets.
   for (int i = 0; i < 10; ++i) {
@@ skipping 63 matching lines @@
 // Test the IsObsoleteTimestamp method with different limit timestamps.
 TEST(PacketBuffer, IsObsoleteTimestamp) {
   TestIsObsoleteTimestamp(0);
   TestIsObsoleteTimestamp(1);
   TestIsObsoleteTimestamp(0xFFFFFFFF);  // -1 in uint32_t.
   TestIsObsoleteTimestamp(0x80000000);  // 2^31.
   TestIsObsoleteTimestamp(0x80000001);  // 2^31 + 1.
   TestIsObsoleteTimestamp(0x7FFFFFFF);  // 2^31 - 1.
 }
 }  // namespace webrtc