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->priority = Packet::kHighestPriority;

[kwiberg-webrtc, 2016/09/20 09:14:45]

Why can you skip this?

[ossu, 2016/09/20 13:51:56]

Because Priority is now default constructed at the highest level
({0, 0}).

---^^ Look, I made an owl!

[kwiberg-webrtc, 2016/09/20 14:56:22]

Acknowledged.

   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 253 matching lines @@
   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.
   a->header.sequenceNumber = b->header.sequenceNumber;
-  a->primary = false;
-  b->primary = true;
+  a->priority = {1, 0};

[hlundin-webrtc, 2016/09/15 09:33:30]

Add tests for the other cases too.

[ossu, 2016/09/15 12:22:53]

Acknowledged.

+  b->priority = {0, 0};
   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;
 }
@@ skipping 72 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