Removed the memory pool from the mixer.

webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc

 /*
  *  Copyright (c) 2015 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 <memory>
 
 #include "testing/gmock/include/gmock/gmock.h"
 
 #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h"
 #include "webrtc/modules/audio_mixer/audio_mixer.h"
 #include "webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h"
 #include "webrtc/modules/audio_mixer/include/audio_mixer_defines.h"
 #include "webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h"
 
 namespace webrtc {
 
 using testing::_;
-using testing::AtLeast;
+using testing::Exactly;
 using testing::Invoke;
 using testing::Return;
 
 using voe::AudioMixer;
 
 class MockMixerAudioSource : public MixerAudioSource {
  public:
   MockMixerAudioSource() {
-    ON_CALL(*this, GetAudioFrame(_, _))
-        .WillByDefault(Invoke(this, &MockMixerAudioSource::FakeAudioFrame));
+    ON_CALL(*this, GetAudioFrameWithMuted(_, _))
+        .WillByDefault(
+            Invoke(this, &MockMixerAudioSource::FakeAudioFrameWithMuted));
   }
-  MOCK_METHOD2(GetAudioFrame,
-               int32_t(const int32_t id, AudioFrame* audio_frame));
+  MOCK_METHOD2(GetAudioFrameWithMuted,
+               AudioFrameWithInfo(const int32_t id, int sample_rate_hz));
   MOCK_CONST_METHOD1(NeededFrequency, int32_t(const int32_t id));
+
   AudioFrame* fake_frame() { return &fake_frame_; }
 
  private:
   AudioFrame fake_frame_;
-  int32_t FakeAudioFrame(const int32_t id, AudioFrame* audio_frame) {
-    audio_frame->CopyFrom(fake_frame_);
-    return 0;
+  AudioFrameWithInfo FakeAudioFrameWithMuted(const int32_t id,
+                                             int sample_rate_hz) {
+    return {
+        fake_frame(),             // audio_frame_pointer
+        AudioFrameInfo::kNormal,  // audio_frame_info
+    };
   }
 };
 
 class BothMixersTest : public testing::Test {
  protected:
   BothMixersTest() {
     // Create an OutputMixer.
     AudioMixer::Create(audio_mixer_, kId);
 
     // Create one mixer participant and add it to the mixer.
@@ skipping 106 matching lines @@
     participants[i].fake_frame()->num_channels_ = 1;
 
     // Frame duration 10ms.
     participants[i].fake_frame()->samples_per_channel_ = kSampleRateHz / 100;
 
     // 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], GetAudioFrame(_, _)).Times(AtLeast(1));
+    EXPECT_CALL(participants[i], GetAudioFrameWithMuted(_, _))
+        .Times(Exactly(1));
     EXPECT_CALL(participants[i], NeededFrequency(_))
         .WillRepeatedly(Return(kSampleRateHz));
   }
 
   // Last participant gives audio frame with passive VAD, although it has the
   // largest energy.
   participants[kParticipants - 1].fake_frame()->vad_activity_ =
       AudioFrame::kVadPassive;
 
   AudioFrame audio_frame;
   mixer->Mix(&audio_frame);
 
   for (int i = 0; i < kParticipants; ++i) {
     bool is_mixed = participants[i].IsMixed();
     if (i == kParticipants - 1 ||
         i < kParticipants - 1 -
                 NewAudioConferenceMixer::kMaximumAmountOfMixedParticipants) {
       EXPECT_FALSE(is_mixed) << "Mixing status of Participant #" << i
                              << " wrong.";
     } else {
       EXPECT_TRUE(is_mixed) << "Mixing status of Participant #" << i
                             << " wrong.";
     }
   }
 }
 
 TEST_F(BothMixersTest, CompareInitialFrameAudio) {
-  EXPECT_CALL(participant_, GetAudioFrame(_, _)).Times(AtLeast(1));
+  EXPECT_CALL(participant_, GetAudioFrameWithMuted(_, _)).Times(Exactly(1));
 
   // Make sure the participant is marked as 'non-mixed' so that it is
   // ramped in next round.
   ResetParticipant();
 
   // Construct the expected sound for the first mixing round.
   mixing_round_frame.CopyFrom(*participant_.fake_frame());
   RampIn(mixing_round_frame);
 
   // Mix frames and put the result into a frame.
   audio_mixer_->MixActiveChannels();
   audio_mixer_->GetMixedAudio(kSampleRateHz, 1, &mixed_results_frame_);
 
   // Compare the received frame with the expected.
   EXPECT_EQ(mixing_round_frame.sample_rate_hz_,
             mixed_results_frame_.sample_rate_hz_);
   EXPECT_EQ(mixing_round_frame.num_channels_,
             mixed_results_frame_.num_channels_);
   EXPECT_EQ(mixing_round_frame.samples_per_channel_,
             mixed_results_frame_.samples_per_channel_);
   EXPECT_EQ(0, memcmp(mixing_round_frame.data_, mixed_results_frame_.data_,
                       sizeof(mixing_round_frame.data_)));
 }
 
 TEST_F(BothMixersTest, CompareSecondFrameAudio) {
-  EXPECT_CALL(participant_, GetAudioFrame(_, _)).Times(AtLeast(1));
+  EXPECT_CALL(participant_, GetAudioFrameWithMuted(_, _)).Times(Exactly(2));
 
   // Make sure the participant is marked as 'non-mixed' so that it is
   // ramped in next round.
   ResetParticipant();
 
   // Do one mixing iteration.
   audio_mixer_->MixActiveChannels();
 
   // Mix frames a second time and compare with the expected frame
   // (which is the participant's frame).
   audio_mixer_->MixActiveChannels();
   audio_mixer_->GetMixedAudio(kSampleRateHz, 1, &mixed_results_frame_);
   EXPECT_EQ(0,
             memcmp(participant_.fake_frame()->data_, mixed_results_frame_.data_,
                    sizeof(mixing_round_frame.data_)));
 }
 
 }  // namespace webrtc