commit aa8b67da9d205d21c6718cd6e98d445bd3645f86
author Oskar Sundbom <ossu@webrtc.org> Fri Nov 17 14:34:48 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Nov 20 10:19:30 2017 +0000
tree 9df355adca5df4aca717c17c72ff9fec7ea3f9d5
parent 28dfeb7f249d4bbbb319ffd3f72a3abd00a7885d

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

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=henrik.lundin@webrtc.org

Bug: None
Change-Id: I733a83f702fe11884d229a1713cfac952727bde8
Reviewed-on: https://webrtc-review.googlesource.com/23601
Commit-Queue: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20786}

modules/audio_processing/level_controller/level_controller.cc

diff --git a/modules/audio_processing/level_controller/level_controller.cc b/modules/audio_processing/level_controller/level_controller.cc
index 6343ef7..521f82e 100644
--- a/modules/audio_processing/level_controller/level_controller.cc
+++ b/modules/audio_processing/level_controller/level_controller.cc
@@ -202,7 +202,7 @@
   metrics_.Initialize(sample_rate_hz);
 
   last_gain_ = 1.0f;
-  sample_rate_hz_ = rtc::Optional<int>(sample_rate_hz);
+  sample_rate_hz_ = sample_rate_hz;
   dc_forgetting_factor_ = 0.01f * sample_rate_hz / 48000.f;
   std::fill(dc_level_, dc_level_ + arraysize(dc_level_), 0.f);
 }

modules/audio_processing/level_controller/level_controller_unittest.cc

diff --git a/modules/audio_processing/level_controller/level_controller_unittest.cc b/modules/audio_processing/level_controller/level_controller_unittest.cc
index 837cfc3..cb36ae0 100644
--- a/modules/audio_processing/level_controller/level_controller_unittest.cc
+++ b/modules/audio_processing/level_controller/level_controller_unittest.cc
@@ -90,20 +90,20 @@
 
 TEST(LevelControlBitExactnessTest, Mono8kHz) {
   const float kOutputReference[] = {-0.013939f, -0.012154f, -0.009054f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate8kHz, 1,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate8kHz, 1, rtc::nullopt,
+                      kOutputReference);
 }
 
 TEST(LevelControlBitExactnessTest, Mono16kHz) {
   const float kOutputReference[] = {-0.013706f, -0.013215f, -0.013018f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate16kHz, 1,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate16kHz, 1, rtc::nullopt,
+                      kOutputReference);
 }
 
 TEST(LevelControlBitExactnessTest, Mono32kHz) {
   const float kOutputReference[] = {-0.014495f, -0.016425f, -0.016085f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate32kHz, 1,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate32kHz, 1, rtc::nullopt,
+                      kOutputReference);
 }
 
 // TODO(peah): Investigate why this particular testcase differ between Android
@@ -115,42 +115,42 @@
 #else
   const float kOutputReference[] = {-0.014306f, -0.015209f, -0.017466f};
 #endif
-  RunBitexactnessTest(AudioProcessing::kSampleRate48kHz, 1,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate48kHz, 1, rtc::nullopt,
+                      kOutputReference);
 }
 
 TEST(LevelControlBitExactnessTest, Stereo8kHz) {
   const float kOutputReference[] = {-0.014063f, -0.008450f, -0.012159f,
                                     -0.051967f, -0.023202f, -0.047858f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate8kHz, 2,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate8kHz, 2, rtc::nullopt,
+                      kOutputReference);
 }
 
 TEST(LevelControlBitExactnessTest, Stereo16kHz) {
   const float kOutputReference[] = {-0.012714f, -0.005896f, -0.012220f,
                                     -0.053306f, -0.024549f, -0.051527f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate16kHz, 2,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate16kHz, 2, rtc::nullopt,
+                      kOutputReference);
 }
 
 TEST(LevelControlBitExactnessTest, Stereo32kHz) {
   const float kOutputReference[] = {-0.011764f, -0.007044f, -0.013472f,
                                     -0.053537f, -0.026322f, -0.056253f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate32kHz, 2,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate32kHz, 2, rtc::nullopt,
+                      kOutputReference);
 }
 
 TEST(LevelControlBitExactnessTest, Stereo48kHz) {
   const float kOutputReference[] = {-0.010643f, -0.006334f, -0.011377f,
                                     -0.049088f, -0.023600f, -0.050465f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate48kHz, 2,
-                      rtc::Optional<float>(), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate48kHz, 2, rtc::nullopt,
+                      kOutputReference);
 }
 
 TEST(LevelControlBitExactnessTest, MonoInitial48kHz) {
   const float kOutputReference[] = {-0.013884f, -0.014761f, -0.016951f};
-  RunBitexactnessTest(AudioProcessing::kSampleRate48kHz, 1,
-                      rtc::Optional<float>(-50), kOutputReference);
+  RunBitexactnessTest(AudioProcessing::kSampleRate48kHz, 1, -50,
+                      kOutputReference);
 }
 
 }  // namespace webrtc