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/acm2/acm_receiver.cc

diff --git a/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc
index 360a583..8f8b273 100644
--- a/modules/audio_coding/acm2/acm_receiver.cc
+++ b/modules/audio_coding/acm2/acm_receiver.cc
@@ -103,7 +103,7 @@
       last_audio_decoder_ = ci;
       last_audio_format_ = neteq_->GetDecoderFormat(ci->pltype);
       RTC_DCHECK(last_audio_format_);
-      last_packet_sample_rate_hz_ = rtc::Optional<int>(ci->plfreq);
+      last_packet_sample_rate_hz_ = ci->plfreq;
     }
   }  // |crit_sect_| is released.
 
@@ -272,9 +272,9 @@
 void AcmReceiver::RemoveAllCodecs() {
   rtc::CritScope lock(&crit_sect_);
   neteq_->RemoveAllPayloadTypes();
-  last_audio_decoder_ = rtc::Optional<CodecInst>();
-  last_audio_format_ = rtc::Optional<SdpAudioFormat>();
-  last_packet_sample_rate_hz_ = rtc::Optional<int>();
+  last_audio_decoder_ = rtc::nullopt;
+  last_audio_format_ = rtc::nullopt;
+  last_packet_sample_rate_hz_ = rtc::nullopt;
 }
 
 int AcmReceiver::RemoveCodec(uint8_t payload_type) {
@@ -285,9 +285,9 @@
     return -1;
   }
   if (last_audio_decoder_ && payload_type == last_audio_decoder_->pltype) {
-    last_audio_decoder_ = rtc::Optional<CodecInst>();
-    last_audio_format_ = rtc::Optional<SdpAudioFormat>();
-    last_packet_sample_rate_hz_ = rtc::Optional<int>();
+    last_audio_decoder_ = rtc::nullopt;
+    last_audio_format_ = rtc::nullopt;
+    last_packet_sample_rate_hz_ = rtc::nullopt;
   }
   return 0;
 }