Index: webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc |
diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc |
index 1b86d8326b6af182b925540fcdec7d22ab49682f..52cd6bbdb4ad5e32fc95cadf0fdf6ebd1ebb41a2 100644 |
--- a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc |
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc |
@@ -60,7 +60,7 @@ Packet* PacketGenerator::NextPacket(int payload_size_bytes) { |
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
kwiberg-webrtc
2016/09/20 14:56:22
Acknowledged.
|
packet->payload.SetSize(payload_size_bytes); |
++seq_no_; |
ts_ += frame_size_; |
@@ -284,7 +284,7 @@ TEST(PacketBuffer, ExtractOrderRedundancy) { |
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; |
@@ -558,8 +558,8 @@ TEST(PacketBuffer, ComparePackets) { |
// 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); |