commit 12ab00b4d856d8f8f2fe30ed991bcf4b87e5c392
author Oskar Sundbom <ossu@webrtc.org> Thu Nov 16 15:31:38 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Nov 17 11:58:37 2017 +0000
tree 5b616ccf76c178e3a82d07657106989a46bc4dbf
parent f715c53bcae003ae5f90178b297f2510ff23cc5e

Optional: Use nullopt and implicit construction in /modules/audio_coding

Changes places where we explicitly construct an Optional to instead use
nullopt or the requisite value type only.

This CL was uploaded by git cl split.

R=kwiberg@webrtc.org

Bug: None
Change-Id: I055411a3e521964c81100869a197dd92f5608f1b
Reviewed-on: https://webrtc-review.googlesource.com/23619
Commit-Queue: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20728}

modules/audio_coding/neteq/packet_buffer_unittest.cc

diff --git a/modules/audio_coding/neteq/packet_buffer_unittest.cc b/modules/audio_coding/neteq/packet_buffer_unittest.cc
index 4beead6..0ddeb8a 100644
--- a/modules/audio_coding/neteq/packet_buffer_unittest.cc
+++ b/modules/audio_coding/neteq/packet_buffer_unittest.cc
@@ -188,9 +188,8 @@
                                     &current_cng_pt, &mock_stats));
   EXPECT_TRUE(list.empty());  // The PacketBuffer should have depleted the list.
   EXPECT_EQ(10u, buffer.NumPacketsInBuffer());
-  EXPECT_EQ(rtc::Optional<uint8_t>(0),
-            current_pt);         // Current payload type changed to 0.
-  EXPECT_FALSE(current_cng_pt);  // CNG payload type not changed.
+  EXPECT_EQ(0, current_pt);      // Current payload type changed to 0.
+  EXPECT_EQ(rtc::nullopt, current_cng_pt);  // CNG payload type not changed.
 
   buffer.Flush();  // Clean up.
 
@@ -236,9 +235,8 @@
                                     &current_cng_pt, &mock_stats));
   EXPECT_TRUE(list.empty());  // The PacketBuffer should have depleted the list.
   EXPECT_EQ(1u, buffer.NumPacketsInBuffer());  // Only the last packet.
-  EXPECT_EQ(rtc::Optional<uint8_t>(1),
-            current_pt);         // Current payload type changed to 1.
-  EXPECT_FALSE(current_cng_pt);  // CNG payload type not changed.
+  EXPECT_EQ(1, current_pt);      // Current payload type changed to 1.
+  EXPECT_EQ(rtc::nullopt, current_cng_pt);  // CNG payload type not changed.
 
   buffer.Flush();  // Clean up.
 
@@ -470,9 +468,8 @@
   EXPECT_EQ(1u, buffer.NumPacketsInBuffer());
   ASSERT_TRUE(buffer.PeekNextPacket());
   EXPECT_EQ(kCngPt, buffer.PeekNextPacket()->payload_type);
-  EXPECT_FALSE(current_pt);  // Current payload type not set.
-  EXPECT_EQ(rtc::Optional<uint8_t>(kCngPt),
-            current_cng_pt);  // CNG payload type set.
+  EXPECT_EQ(current_pt, rtc::nullopt);  // Current payload type not set.
+  EXPECT_EQ(kCngPt, current_cng_pt);  // CNG payload type set.
 
   // Insert second packet, which is wide-band speech.
   {
@@ -490,9 +487,8 @@
   ASSERT_TRUE(buffer.PeekNextPacket());
   EXPECT_EQ(kSpeechPt, buffer.PeekNextPacket()->payload_type);
 
-  EXPECT_EQ(rtc::Optional<uint8_t>(kSpeechPt),
-            current_pt);         // Current payload type set.
-  EXPECT_FALSE(current_cng_pt);  // CNG payload type reset.
+  EXPECT_EQ(kSpeechPt, current_pt);  // Current payload type set.
+  EXPECT_EQ(rtc::nullopt, current_cng_pt);  // CNG payload type reset.
 
   buffer.Flush();                        // Clean up.
   EXPECT_CALL(decoder_database, Die());  // Called when object is deleted.