Refactor RMSLevel and give it new functionality

webrtc/modules/audio_processing/rms_level_unittest.cc

Index: webrtc/modules/audio_processing/rms_level_unittest.cc
diff --git a/webrtc/modules/audio_processing/rms_level_unittest.cc b/webrtc/modules/audio_processing/rms_level_unittest.cc
index 7b15717ca0a5fd5f1b985359559e21aa2041d56c..cf0fd4d7398b41100fa4cd89f281ca81e387f527 100644
--- a/webrtc/modules/audio_processing/rms_level_unittest.cc
+++ b/webrtc/modules/audio_processing/rms_level_unittest.cc
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "webrtc/base/array_view.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/base/mathutils.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/audio_processing/rms_level.h"
@@ -22,12 +23,11 @@ namespace {
 constexpr int kSampleRateHz = 48000;
 constexpr size_t kBlockSizeSamples = kSampleRateHz / 100;
 
-std::unique_ptr<RMSLevel> RunTest(rtc::ArrayView<const int16_t> input) {
-  std::unique_ptr<RMSLevel> level(new RMSLevel);
+std::unique_ptr<RmsLevel> RunTest(rtc::ArrayView<const int16_t> input) {
+  std::unique_ptr<RmsLevel> level(new RmsLevel);
   for (size_t n = 0; n + kBlockSizeSamples <= input.size();
        n += kBlockSizeSamples) {
-    level->Process(input.subview(n, kBlockSizeSamples).data(),
-                   kBlockSizeSamples);
+    level->Analyze(input.subview(n, kBlockSizeSamples));
   }
   return level;
 }
@@ -47,46 +47,104 @@ std::vector<int16_t> CreateSinusoid(int frequency_hz,
 TEST(RmsLevelTest, Run1000HzFullScale) {
   auto x = CreateSinusoid(1000, INT16_MAX, kSampleRateHz);
   auto level = RunTest(x);
-  EXPECT_EQ(3, level->RMS());  // -3 dBFS
+  EXPECT_EQ(3, level->Average());  // -3 dBFS
+}
+
+TEST(RmsLevelTest, Run1000HzFullScaleAverageAndPeak) {
+  auto x = CreateSinusoid(1000, INT16_MAX, kSampleRateHz);
+  auto level = RunTest(x);
+  auto stats = level->AverageAndPeak();
+  EXPECT_EQ(3, stats.average);  // -3 dBFS
+  EXPECT_EQ(3, stats.peak);
 }
 
 TEST(RmsLevelTest, Run1000HzHalfScale) {
   auto x = CreateSinusoid(1000, INT16_MAX / 2, kSampleRateHz);
   auto level = RunTest(x);
-  EXPECT_EQ(9, level->RMS());  // -9 dBFS
+  EXPECT_EQ(9, level->Average());  // -9 dBFS
 }
 
 TEST(RmsLevelTest, RunZeros) {
   std::vector<int16_t> x(kSampleRateHz, 0);  // 1 second of pure silence.
   auto level = RunTest(x);
-  EXPECT_EQ(127, level->RMS());
+  EXPECT_EQ(127, level->Average());
+}
+
+TEST(RmsLevelTest, RunZerosAverageAndPeak) {
+  std::vector<int16_t> x(kSampleRateHz, 0);  // 1 second of pure silence.
+  auto level = RunTest(x);
+  auto stats = level->AverageAndPeak();
+  EXPECT_EQ(127, stats.average);
+  EXPECT_EQ(127, stats.peak);
 }
 
 TEST(RmsLevelTest, NoSamples) {
-  RMSLevel level;
-  EXPECT_EQ(127, level.RMS());  // Return minimum if no samples are given.
+  RmsLevel level;
+  EXPECT_EQ(127, level.Average());  // Return minimum if no samples are given.
+}
+
+TEST(RmsLevelTest, NoSamplesAverageAndPeak) {
+  RmsLevel level;
+  auto stats = level.AverageAndPeak();
+  EXPECT_EQ(127, stats.average);
+  EXPECT_EQ(127, stats.peak);
 }
 
 TEST(RmsLevelTest, PollTwice) {
   auto x = CreateSinusoid(1000, INT16_MAX, kSampleRateHz);
   auto level = RunTest(x);
-  level->RMS();
-  EXPECT_EQ(127, level->RMS());  // Stats should be reset at this point.
+  level->Average();
+  EXPECT_EQ(127, level->Average());  // Stats should be reset at this point.
 }
 
 TEST(RmsLevelTest, Reset) {
   auto x = CreateSinusoid(1000, INT16_MAX, kSampleRateHz);
   auto level = RunTest(x);
   level->Reset();
-  EXPECT_EQ(127, level->RMS());  // Stats should be reset at this point.
+  EXPECT_EQ(127, level->Average());  // Stats should be reset at this point.
 }
 
 // Inserts 1 second of full-scale sinusoid, followed by 1 second of muted.
 TEST(RmsLevelTest, ProcessMuted) {
   auto x = CreateSinusoid(1000, INT16_MAX, kSampleRateHz);
   auto level = RunTest(x);
-  level->ProcessMuted(kSampleRateHz);
-  EXPECT_EQ(6, level->RMS());  // Average RMS halved due to the silence.
+  const size_t kBlocksPerSecond = rtc::CheckedDivExact(
+      static_cast<size_t>(kSampleRateHz), kBlockSizeSamples);
+  for (size_t i = 0; i < kBlocksPerSecond; ++i) {
+    level->AnalyzeMuted(kBlockSizeSamples);
+  }
+  EXPECT_EQ(6, level->Average());  // Average RMS halved due to the silence.
+}
+
+// Inserts 1 second of half-scale sinusoid, follwed by 10 ms of full-scale, and
+// finally 1 second of half-scale again. Expect the average to be -9 dBFS due
+// to the vast majority of the signal being half-scale, and the peak to be
+// -3 dBFS.
+TEST(RmsLevelTest, RunHalfScaleAndInsertFullScale) {
+  auto half_scale = CreateSinusoid(1000, INT16_MAX / 2, kSampleRateHz);
+  auto full_scale = CreateSinusoid(1000, INT16_MAX, kSampleRateHz / 100);
+  auto x = half_scale;
+  x.insert(x.end(), full_scale.begin(), full_scale.end());
+  x.insert(x.end(), half_scale.begin(), half_scale.end());
+  ASSERT_EQ(static_cast<size_t>(2 * kSampleRateHz + kSampleRateHz / 100),
+            x.size());
+  auto level = RunTest(x);
+  auto stats = level->AverageAndPeak();
+  EXPECT_EQ(9, stats.average);
+  EXPECT_EQ(3, stats.peak);
+}
+
+TEST(RmsLevelTest, ResetOnBlockSizeChange) {
+  auto x = CreateSinusoid(1000, INT16_MAX, kSampleRateHz);
+  auto level = RunTest(x);
+  // Create a new signal with half amplitude, but double block length.
+  auto y = CreateSinusoid(1000, INT16_MAX / 2, kBlockSizeSamples * 2);
+  level->Analyze(y);
+  auto stats = level->AverageAndPeak();
+  // Expect all stats to only be influenced by the last signal (y), since the
+  // changed block size should reset the stats.
+  EXPECT_EQ(9, stats.average);
+  EXPECT_EQ(9, stats.peak);
 }
 
 }  // namespace webrtc