Revert of Made MixerAudioSource a pure interface.

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.
  */
 
 #include <string.h>
 
 #include <memory>
 #include <utility>
 
 #include "webrtc/base/bind.h"
 #include "webrtc/base/thread.h"
-#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
+#include "webrtc/modules/audio_mixer/audio_mixer.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
 #include "webrtc/test/gmock.h"
 
 using testing::_;
 using testing::Exactly;
 using testing::Invoke;
 using testing::Return;
 
 namespace webrtc {
 
@@ skipping 53 matching lines @@
 // Creates participants from |frames| and |frame_info| and adds them
 // to the mixer. Compares mixed status with |expected_status|
 void MixAndCompare(
     const std::vector<AudioFrame>& frames,
     const std::vector<MixerAudioSource::AudioFrameInfo>& frame_info,
     const std::vector<bool>& expected_status) {
   int num_audio_sources = frames.size();
   RTC_DCHECK(frames.size() == frame_info.size());
   RTC_DCHECK(frame_info.size() == expected_status.size());
 
-  const std::unique_ptr<AudioMixerImpl> mixer(AudioMixerImpl::Create(kId));
+  const std::unique_ptr<AudioMixer> mixer(AudioMixer::Create(kId));
   std::vector<MockMixerAudioSource> participants(num_audio_sources);
 
   for (int i = 0; i < num_audio_sources; i++) {
     participants[i].fake_frame()->CopyFrom(frames[i]);
     participants[i].set_fake_info(frame_info[i]);
   }
 
   for (int i = 0; i < num_audio_sources; i++) {
     EXPECT_EQ(0, mixer->SetMixabilityStatus(&participants[i], true));
     EXPECT_CALL(participants[i],
                 GetAudioFrameWithMuted(_, kDefaultSampleRateHz))
         .Times(Exactly(1));
   }
 
   mixer->Mix(kDefaultSampleRateHz, 1, &frame_for_mixing);
 
   for (int i = 0; i < num_audio_sources; i++) {
-    EXPECT_EQ(expected_status[i],
-              mixer->GetAudioSourceMixabilityStatusForTest(&participants[i]))
+    EXPECT_EQ(expected_status[i], participants[i].IsMixed())
         << "Mixed status of AudioSource #" << i << " wrong.";
   }
 }
 
 TEST(AudioMixer, AnonymousAndNamed) {
   // Should not matter even if partipants are more than
   // kMaximumAmountOfMixedAudioSources.
   constexpr int kNamed = AudioMixer::kMaximumAmountOfMixedAudioSources + 1;
   constexpr int kAnonymous = AudioMixer::kMaximumAmountOfMixedAudioSources + 1;
 
@@ skipping 39 matching lines @@
   // 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) {
   constexpr int kAudioSources =
       AudioMixer::kMaximumAmountOfMixedAudioSources + 3;
 
-  const std::unique_ptr<AudioMixerImpl> mixer(AudioMixerImpl::Create(kId));
+  const std::unique_ptr<AudioMixer> mixer(AudioMixer::Create(kId));
 
   MockMixerAudioSource participants[kAudioSources];
 
   for (int i = 0; i < kAudioSources; ++i) {
     ResetFrame(participants[i].fake_frame());
 
     // We set the 80-th sample value since the first 80 samples may be
     // modified by a ramped-in window.
     participants[i].fake_frame()->data_[80] = i;
 
     EXPECT_EQ(0, mixer->SetMixabilityStatus(&participants[i], true));
     EXPECT_CALL(participants[i], GetAudioFrameWithMuted(_, _))
         .Times(Exactly(1));
   }
 
   // Last participant gives audio frame with passive VAD, although it has the
   // largest energy.
   participants[kAudioSources - 1].fake_frame()->vad_activity_ =
       AudioFrame::kVadPassive;
 
   AudioFrame audio_frame;
   mixer->Mix(kDefaultSampleRateHz,
              1,  // number of channels
              &audio_frame);
 
   for (int i = 0; i < kAudioSources; ++i) {
-    bool is_mixed =
-        mixer->GetAudioSourceMixabilityStatusForTest(&participants[i]);
+    bool is_mixed = participants[i].IsMixed();
     if (i == kAudioSources - 1 ||
         i < kAudioSources - 1 - AudioMixer::kMaximumAmountOfMixedAudioSources) {
       EXPECT_FALSE(is_mixed) << "Mixing status of AudioSource #" << i
                              << " wrong.";
     } else {
       EXPECT_TRUE(is_mixed) << "Mixing status of AudioSource #" << i
                             << " wrong.";
     }
   }
 }
@@ skipping 136 matching lines @@
   EXPECT_EQ(std::numeric_limits<int16_t>::max(),
             mixer->GetOutputAudioLevelFullRange());
 }
 
 // Maximal amount of participants are mixed one iteration, then
 // another participant with higher energy is added.
 TEST(AudioMixer, RampedOutSourcesShouldNotBeMarkedMixed) {
   constexpr int kAudioSources =
       AudioMixer::kMaximumAmountOfMixedAudioSources + 1;
 
-  const std::unique_ptr<AudioMixerImpl> mixer(AudioMixerImpl::Create(kId));
+  const std::unique_ptr<AudioMixer> mixer(AudioMixer::Create(kId));
   MockMixerAudioSource participants[kAudioSources];
 
   for (int i = 0; i < kAudioSources; i++) {
     ResetFrame(participants[i].fake_frame());
     // Set the participant audio energy to increase with the index
     // |i|.
     participants[i].fake_frame()->data_[0] = 100 * i;
   }
 
   // Add all participants but the loudest for mixing.
   for (int i = 0; i < kAudioSources - 1; i++) {
     EXPECT_EQ(0, mixer->SetMixabilityStatus(&participants[i], true));
     EXPECT_CALL(participants[i],
                 GetAudioFrameWithMuted(_, kDefaultSampleRateHz))
         .Times(Exactly(1));
   }
 
   // First mixer iteration
   mixer->Mix(kDefaultSampleRateHz, 1, &frame_for_mixing);
 
   // All participants but the loudest should have been mixed.
   for (int i = 0; i < kAudioSources - 1; i++) {
-    EXPECT_TRUE(mixer->GetAudioSourceMixabilityStatusForTest(&participants[i]))
-        << "Mixed status of AudioSource #" << i << " wrong.";
+    EXPECT_TRUE(participants[i].IsMixed()) << "Mixed status of AudioSource #"
+                                           << i << " wrong.";
   }
 
   // Add new participant with higher energy.
   EXPECT_EQ(0,
             mixer->SetMixabilityStatus(&participants[kAudioSources - 1], true));
   for (int i = 0; i < kAudioSources; i++) {
     EXPECT_CALL(participants[i],
                 GetAudioFrameWithMuted(_, kDefaultSampleRateHz))
         .Times(Exactly(1));
   }
 
   mixer->Mix(kDefaultSampleRateHz, 1, &frame_for_mixing);
 
   // The most quiet participant should not have been mixed.
-  EXPECT_FALSE(mixer->GetAudioSourceMixabilityStatusForTest(&participants[0]))
+  EXPECT_FALSE(participants[0].IsMixed())
       << "Mixed status of AudioSource #0 wrong.";
 
   // The loudest participants should have been mixed.
   for (int i = 1; i < kAudioSources; i++) {
-    EXPECT_EQ(true,
-              mixer->GetAudioSourceMixabilityStatusForTest(&participants[i]))
+    EXPECT_EQ(true, participants[i].IsMixed())
         << "Mixed status of AudioSource #" << i << " wrong.";
   }
 }
 
 // This test checks that the initialization and participant addition
 // can be done on a different thread.
 TEST(AudioMixer, ConstructFromOtherThread) {
   std::unique_ptr<rtc::Thread> init_thread = rtc::Thread::Create();
   std::unique_ptr<rtc::Thread> participant_thread = rtc::Thread::Create();
   init_thread->Start();
@@ skipping 90 matching lines @@
       kAudioSources, MixerAudioSource::AudioFrameInfo::kNormal);
   frame_info[0] = MixerAudioSource::AudioFrameInfo::kMuted;
   std::fill(frames[0].data_, frames[0].data_ + kDefaultSampleRateHz / 100,
             std::numeric_limits<int16_t>::max());
   std::vector<bool> expected_status(kAudioSources, true);
   expected_status[0] = false;
 
   MixAndCompare(frames, frame_info, expected_status);
 }
 }  // namespace webrtc