NetEq: Change member variables for current RTP types to rtc::Optionals

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 156 matching lines @@
   PacketList list;
   const int payload_len = 10;
 
   // Insert 10 small packets.
   for (int i = 0; i < 10; ++i) {
     Packet* packet = gen.NextPacket(payload_len);
     list.push_back(packet);
   }
 
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
   EXPECT_EQ(PacketBuffer::kOK, buffer.InsertPacketList(&list,
                                                        decoder_database,
                                                        &current_pt,
                                                        &current_cng_pt));
   EXPECT_TRUE(list.empty());  // The PacketBuffer should have depleted the list.
   EXPECT_EQ(10u, buffer.NumPacketsInBuffer());
-  EXPECT_EQ(0, current_pt);  // Current payload type changed to 0.
-  EXPECT_EQ(0xFF, current_cng_pt);  // CNG payload type not changed.
+  EXPECT_EQ(0, current_pt.value_or(-1));  // Current payload type changed to 0.

[kwiberg-webrtc, 2016/08/30 10:29:32]

Or

  EXPECT_EQ(rtc::Optional<uint8_t>(0), current_pt);

[hlundin-webrtc, 2016/08/30 10:53:16]

Done.

+  EXPECT_FALSE(current_cng_pt);           // CNG payload type not changed.
 
   buffer.Flush();  // Clean up.
 
   EXPECT_CALL(decoder_database, Die());  // Called when object is deleted.
 }
 
 // Test inserting a list of packets. Last packet is of a different payload type.
 // Expecting the buffer to flush.
 // TODO(hlundin): Remove this test when legacy operation is no longer needed.
 TEST(PacketBuffer, InsertPacketListChangePayloadType) {
   TickTimer tick_timer;
   PacketBuffer buffer(10, &tick_timer);  // 10 packets.
   PacketGenerator gen(0, 0, 0, 10);
   PacketList list;
   const int payload_len = 10;
 
   // Insert 10 small packets.
   for (int i = 0; i < 10; ++i) {
     Packet* packet = gen.NextPacket(payload_len);
     list.push_back(packet);
   }
   // Insert 11th packet of another payload type (not CNG).
   Packet* packet = gen.NextPacket(payload_len);
   packet->header.payloadType = 1;
   list.push_back(packet);
 
 
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
   EXPECT_EQ(PacketBuffer::kFlushed, buffer.InsertPacketList(&list,
                                                             decoder_database,
                                                             &current_pt,
                                                             &current_cng_pt));
   EXPECT_TRUE(list.empty());  // The PacketBuffer should have depleted the list.
   EXPECT_EQ(1u, buffer.NumPacketsInBuffer());  // Only the last packet.
-  EXPECT_EQ(1, current_pt);  // Current payload type changed to 0.
-  EXPECT_EQ(0xFF, current_cng_pt);  // CNG payload type not changed.
+  EXPECT_EQ(1, current_pt.value_or(-1));  // Current payload type changed to 0.
+  EXPECT_FALSE(current_cng_pt);           // CNG payload type not changed.
 
   buffer.Flush();  // Clean up.
 
   EXPECT_CALL(decoder_database, Die());  // Called when object is deleted.
 }
 
 TEST(PacketBuffer, ExtractOrderRedundancy) {
   TickTimer tick_timer;
   PacketBuffer buffer(100, &tick_timer);  // 100 packets.
   const int kPackets = 18;
@@ skipping 99 matching lines @@
   for (int i = 0; i < 10; ++i) {
     Packet* packet = gen.NextPacket(payload_len);
     if (i % 2) {
       list.push_front(packet);
     } else {
       list.push_back(packet);
     }
   }
 
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
 
   EXPECT_EQ(PacketBuffer::kOK, buffer.InsertPacketList(&list,
                                                        decoder_database,
                                                        &current_pt,
                                                        &current_cng_pt));
   EXPECT_EQ(10u, buffer.NumPacketsInBuffer());
 
   // Extract them and make sure that come out in the right order.
   uint32_t current_ts = start_ts;
   for (int i = 0; i < 10; ++i) {
@@ skipping 49 matching lines @@
   // discarded.
   buffer = new PacketBuffer(100, &tick_timer);  // 100 packets.
   PacketList list;
   list.push_back(gen.NextPacket(payload_len));  // Valid packet.
   packet = gen.NextPacket(payload_len);
   delete [] packet->payload;
   packet->payload = NULL;  // Invalid.
   list.push_back(packet);
   list.push_back(gen.NextPacket(payload_len));  // Valid packet.
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
   EXPECT_EQ(PacketBuffer::kInvalidPacket,
             buffer->InsertPacketList(&list,
                                      decoder_database,
                                      &current_pt,
                                      &current_cng_pt));
   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.
 }
@@ skipping 137 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