Changed mixing api and removed resampler

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 51 matching lines @@
  public:
   MockMixerAudioSource()
       : fake_audio_frame_info_(MixerAudioSource::AudioFrameInfo::kNormal) {
     ON_CALL(*this, GetAudioFrameWithMuted(_, _))
         .WillByDefault(
             Invoke(this, &MockMixerAudioSource::FakeAudioFrameWithMuted));
   }
 
   MOCK_METHOD2(GetAudioFrameWithMuted,
                AudioFrameWithMuted(const int32_t id, int sample_rate_hz));
-  MOCK_CONST_METHOD1(NeededFrequency, int32_t(const int32_t id));
 
   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_;
   AudioFrameInfo fake_audio_frame_info_;
@@ skipping 16 matching lines @@
   CompareWithOldMixerTest()
       : old_mixer_(AudioConferenceMixer::Create(kId)),
         new_mixer_(NewAudioConferenceMixer::Create(kId)) {}
 
   ~CompareWithOldMixerTest() { Reset(); }
 
   // Mixes with both mixers and compares results: resulting frames and
   // mix statuses.
   void MixAndCompare() {
     old_mixer_->Process();
-    new_mixer_->Mix(&new_mixer_frame_);
+    new_mixer_->Mix(kSampleRateHz,
+                    1,  // number of channels
+                    &new_mixer_frame_);
     EXPECT_EQ(0, memcmp(old_mixer_frame_.data_, new_mixer_frame_.data_,
                         sizeof(old_mixer_frame_.data_)));
 
     for (auto& participant_pair : participants_) {
       EXPECT_EQ(participant_pair.first->IsMixed(),
                 participant_pair.second->IsMixed());
     }
   }
 
   std::unique_ptr<AudioFrame> last_mixed_audio_old() {
@@ skipping 75 matching lines @@
 
     // We modify one sample within the RampIn window and one sample
     // outside of it.
     participant_.fake_frame()->data_[10] = 100;
     participant_.fake_frame()->data_[20] = -200;
     participant_.fake_frame()->data_[30] = 300;
     participant_.fake_frame()->data_[90] = -400;
 
     // Frame duration 10ms.
     participant_.fake_frame()->samples_per_channel_ = kSampleRateHz / 100;
-    EXPECT_CALL(participant_, NeededFrequency(_))
-        .WillRepeatedly(Return(kSampleRateHz));
   }
 
   ~BothMixersTest() { AudioMixer::Destroy(audio_mixer_); }
 
   // Mark the participant as 'unmixed' last round.
   void ResetAudioSource() { participant_._mixHistory->SetIsMixed(false); }
 
   AudioMixer* audio_mixer_;
   MockMixerAudioSource participant_;
   AudioFrame mixing_round_frame, mixed_results_frame_;
@@ skipping 78 matching lines @@
     // 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], 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[kAudioSources - 1].fake_frame()->vad_activity_ =
       AudioFrame::kVadPassive;
 
   AudioFrame audio_frame;
-  mixer->Mix(&audio_frame);
+  mixer->Mix(kSampleRateHz,
+             1,  // number of channels
+             &audio_frame);
 
   for (int i = 0; i < kAudioSources; ++i) {
     bool is_mixed = participants[i].IsMixed();
     if (i == kAudioSources - 1 ||
         i < kAudioSources - 1 -
                 NewAudioConferenceMixer::kMaximumAmountOfMixedAudioSources) {
       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;
+  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;
+  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_);
+  }
+}
+

[aleloi2, 2016/08/06 10:13:50]

Two new tests to check that the mixer asks for the expected sample rate and
frequency, and that the result has that rate & frequncy.

 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);
 
   // 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_, GetAudioFrameWithMuted(_, _)).Times(Exactly(2));
 
   // Make sure the participant is marked as 'non-mixed' so that it is
   // ramped in next round.
   ResetAudioSource();
 
   // Do one mixing iteration.
-  audio_mixer_->MixActiveChannels();
+  audio_mixer_->GetMixedAudio(kSampleRateHz, 1, &mixed_results_frame_);
 
   // 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_)));
 }
 
 TEST_F(CompareWithOldMixerTest, TwoParticipantsNormalFrames) {
   Reset();
   AudioFrame first_frame, second_frame;
 
@@ skipping 54 matching lines @@
                      MixerParticipant::AudioFrameInfo::kMuted);
     } else {
       AddParticipant(&audio_frames[i],
                      MixerParticipant::AudioFrameInfo::kNormal);
     }
     MixAndCompare();
   }
 }
 
 }  // namespace webrtc