Added a level indicator to new mixer.

webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc

 /*
  *  Copyright (c) 2016 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 59 matching lines @@
   MOCK_METHOD2(GetAudioFrameWithMuted,
                AudioFrameWithMuted(const int32_t id, int sample_rate_hz));
 
   AudioFrame* fake_frame() { return &fake_frame_; }
   AudioFrameInfo fake_info() { return fake_audio_frame_info_; }
   void set_fake_info(const AudioFrameInfo audio_frame_info) {
     fake_audio_frame_info_ = audio_frame_info;
   }
 
  private:
-  AudioFrame fake_frame_;
+  AudioFrame fake_frame_, output_frame_;
   AudioFrameInfo fake_audio_frame_info_;
   AudioFrameWithMuted FakeAudioFrameWithMuted(const int32_t id,
                                               int sample_rate_hz) {
+    output_frame_.CopyFrom(fake_frame_);
     return {
-        fake_frame(),  // audio_frame_pointer
-        fake_info(),   // audio_frame_info
+        &output_frame_,  // audio_frame_pointer
+        fake_info(),     // audio_frame_info
     };
   }
 };
 
 // Keeps two identical sets of participants and two mixers to test
 // that the same participants are chosen for mixing.
 class CompareWithOldMixerTest : public testing::Test, AudioMixerOutputReceiver {
  protected:
   constexpr static int kId = 1;
   constexpr static int kSampleRateHz = 32000;
@@ skipping 170 matching lines @@
   }
 
   // SetMixabilityStatus(anonymous, false) will remove anonymous from both
   // anonymous and named groups.
   EXPECT_EQ(0, mixer->SetMixabilityStatus(&anonymous[kAnonymous - 1], false));
   EXPECT_FALSE(mixer->AnonymousMixabilityStatus(anonymous[kAnonymous - 1]));
   EXPECT_FALSE(mixer->MixabilityStatus(anonymous[kAnonymous - 1]));
 }
 
 TEST(AudioMixer, LargestEnergyVadActiveMixed) {
-  const int kId = 1;
-  const int kAudioSources =
+  constexpr int kId = 1;
+  constexpr int kAudioSources =
       NewAudioConferenceMixer::kMaximumAmountOfMixedAudioSources + 3;
-  const int kSampleRateHz = 32000;
+  constexpr int kSampleRateHz = 32000;
 
   std::unique_ptr<NewAudioConferenceMixer> mixer(
       NewAudioConferenceMixer::Create(kId));
 
   MockMixerAudioSource participants[kAudioSources];
 
   for (int i = 0; i < kAudioSources; ++i) {
     participants[i].fake_frame()->id_ = i;
     participants[i].fake_frame()->sample_rate_hz_ = kSampleRateHz;
     participants[i].fake_frame()->speech_type_ = AudioFrame::kNormalSpeech;
@@ skipping 30 matching lines @@
       EXPECT_FALSE(is_mixed) << "Mixing status of AudioSource #" << i
                              << " wrong.";
     } else {
       EXPECT_TRUE(is_mixed) << "Mixing status of AudioSource #" << i
                             << " wrong.";
     }
   }
 }
 
 TEST(AudioMixer, ParticipantSampleRate) {
-  const int kId = 1;
+  constexpr int kId = 1;
   std::unique_ptr<NewAudioConferenceMixer> mixer(
       NewAudioConferenceMixer::Create(kId));
   AudioFrame frame_for_mixing;
 
   MockMixerAudioSource participant;
   participant.fake_frame()->sample_rate_hz_ = 8000;
   participant.fake_frame()->num_channels_ = 1;
 
   // Frame duration 10ms.
   participant.fake_frame()->samples_per_channel_ = 8000 / 100;
 
   EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
   for (auto frequency : {8000, 16000, 32000, 48000}) {
     EXPECT_CALL(participant, GetAudioFrameWithMuted(_, frequency))
         .Times(Exactly(1));
     mixer->Mix(frequency, 1, &frame_for_mixing);
     EXPECT_EQ(frequency, frame_for_mixing.sample_rate_hz_);
   }
 }
 
 TEST(AudioMixer, ParticipantNumberOfChannels) {
-  const int kId = 1;
+  constexpr int kId = 1;
   std::unique_ptr<NewAudioConferenceMixer> mixer(
       NewAudioConferenceMixer::Create(kId));
   AudioFrame frame_for_mixing;
 
   MockMixerAudioSource participant;
   participant.fake_frame()->sample_rate_hz_ = 8000;
   participant.fake_frame()->num_channels_ = 1;
 
   // Frame duration 10ms.
   participant.fake_frame()->samples_per_channel_ = 8000 / 100;
 
   EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
   for (size_t number_of_channels : {1, 2}) {
     EXPECT_CALL(participant, GetAudioFrameWithMuted(_, 8000)).Times(Exactly(1));
     mixer->Mix(8000, number_of_channels, &frame_for_mixing);
     EXPECT_EQ(number_of_channels, frame_for_mixing.num_channels_);
   }
 }
 
+// Test that the volume is reported as zero when the mixer input
+// comprises only zero values.
+TEST(AudioMixer, LevelIsZeroWhenMixingZeroes) {
+  constexpr int kId = 1;
+  constexpr int kSampleRateHz = 8000;
+  std::unique_ptr<NewAudioConferenceMixer> mixer(

[kwiberg-webrtc, 2016/08/24 08:04:39]

You can make mixer const (i.e., const std::unique_ptr<NewAudioConferenceMixer>),
since you never reassign it.

[aleloi, 2016/08/24 08:15:16]

I'll do it in one of the dependent CLs. I've changed names and moved things
around, so it will be less manual merging this way.

+      NewAudioConferenceMixer::Create(kId));
+  AudioFrame frame_for_mixing;
+
+  MockMixerAudioSource participant;
+  participant.fake_frame()->sample_rate_hz_ = kSampleRateHz;
+  participant.fake_frame()->num_channels_ = 1;
+
+  // Frame duration 10ms.
+  participant.fake_frame()->samples_per_channel_ = kSampleRateHz / 100;
+
+  EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
+  for (size_t i = 0; i < 11; i++) {

[kwiberg-webrtc, 2016/08/24 08:04:39]

I'm pretty sure these indexes will fit in an int...

[aleloi, 2016/08/24 08:15:16]

This has been pointed out by ivoc@ in one of the dependent CLs.

+    EXPECT_CALL(participant, GetAudioFrameWithMuted(_, kSampleRateHz))
+        .Times(Exactly(1));
+    mixer->Mix(8000, 1, &frame_for_mixing);
+  }
+
+  EXPECT_EQ(0, mixer->GetOutputAudioLevel());
+  EXPECT_EQ(0, mixer->GetOutputAudioLevelFullRange());
+}
+
+// Test that the reported volume is maximal when the mixer
+// input comprises frames with maximal values.
+TEST(AudioMixer, LevelIsMaximalWhenMixingMaximalValues) {
+  constexpr int kId = 1;
+  constexpr int kSampleRateHz = 8000;
+  std::unique_ptr<NewAudioConferenceMixer> mixer(
+      NewAudioConferenceMixer::Create(kId));

[kwiberg-webrtc, 2016/08/24 08:04:39]

const here too.

[aleloi, 2016/08/24 08:15:16]

Same as above.

+  AudioFrame frame_for_mixing;
+
+  MockMixerAudioSource participant;
+  participant.fake_frame()->sample_rate_hz_ = kSampleRateHz;
+  participant.fake_frame()->num_channels_ = 1;
+
+  // Frame duration 10ms.
+  participant.fake_frame()->samples_per_channel_ = kSampleRateHz / 100;
+
+  // Fill participant frame data with maximal sound.
+  std::fill(participant.fake_frame()->data_,
+            participant.fake_frame()->data_ + kSampleRateHz / 100,
+            std::numeric_limits<int16_t>::max());
+
+  EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
+  for (size_t i = 0; i < 11; i++) {
+    EXPECT_CALL(participant, GetAudioFrameWithMuted(_, kSampleRateHz))
+        .Times(Exactly(1));
+    mixer->Mix(8000, 1, &frame_for_mixing);
+  }
+
+  // 9 is the highest possible audio level
+  EXPECT_EQ(9, mixer->GetOutputAudioLevel());
+
+  // 0x7fff = 32767 is the highest full range audio level.
+  EXPECT_EQ(std::numeric_limits<int16_t>::max(),
+            mixer->GetOutputAudioLevelFullRange());
+}
+
 TEST_F(BothMixersTest, CompareInitialFrameAudio) {
   EXPECT_CALL(participant_, GetAudioFrameWithMuted(_, _)).Times(Exactly(1));
 
   // Make sure the participant is marked as 'non-mixed' so that it is
   // ramped in next round.
   ResetAudioSource();
 
   // Construct the expected sound for the first mixing round.
   mixing_round_frame.CopyFrom(*participant_.fake_frame());
   RampIn(mixing_round_frame);
@@ skipping 91 matching lines @@
                      MixerParticipant::AudioFrameInfo::kMuted);
     } else {
       AddParticipant(&audio_frames[i],
                      MixerParticipant::AudioFrameInfo::kNormal);
     }
     MixAndCompare();
   }
 }
 
 }  // namespace webrtc