Less lock acquisitions for AudioMixer.

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 "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/thread.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
 #include "webrtc/modules/audio_mixer/audio_mixer.h"
 
 using testing::_;
 using testing::Exactly;
 using testing::Invoke;
 using testing::Return;
 
 namespace webrtc {
 
@@ skipping 71 matching lines @@
   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(participants[i].IsMixed(), expected_status[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 78 matching lines @@
         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.";
     }
   }
 }
 
+TEST(AudioMixer, FrameNotModifiedForSingleParticipant) {
+  const std::unique_ptr<AudioMixer> mixer(AudioMixer::Create(kId));
+
+  MockMixerAudioSource participant;
+
+  ResetFrame(participant.fake_frame());
+  const int n_samples = participant.fake_frame()->samples_per_channel_;
+
+  // Modify the frame so that it's not zero.
+  for (int j = 0; j < n_samples; j++) {
+    participant.fake_frame()->data_[j] = j;
+  }
+
+  EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
+  EXPECT_CALL(participant, GetAudioFrameWithMuted(_, _)).Times(Exactly(2));
+
+  AudioFrame audio_frame;
+  // Two mix iteration to compare after the ramp-up step.
+  for (int i = 0; i < 2; i++) {
+    mixer->Mix(kDefaultSampleRateHz,
+               1,  // number of channels
+               &audio_frame);
+  }
+
+  EXPECT_EQ(
+      0, memcmp(participant.fake_frame()->data_, audio_frame.data_, n_samples));
+}
+
+TEST(AudioMixer, FrameNotModifiedForSingleAnonymousParticipant) {
+  const std::unique_ptr<AudioMixer> mixer(AudioMixer::Create(kId));
+
+  MockMixerAudioSource participant;
+
+  ResetFrame(participant.fake_frame());
+  const int n_samples = participant.fake_frame()->samples_per_channel_;
+
+  // Modify the frame so that it's not zero.
+  for (int j = 0; j < n_samples; j++) {
+    participant.fake_frame()->data_[j] = j;
+  }
+
+  EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
+  EXPECT_EQ(0, mixer->SetAnonymousMixabilityStatus(&participant, true));
+  EXPECT_CALL(participant, GetAudioFrameWithMuted(_, _)).Times(Exactly(2));
+
+  AudioFrame audio_frame;
+  // Two mix iteration to compare after the ramp-up step.
+  for (int i = 0; i < 2; i++) {
+    mixer->Mix(kDefaultSampleRateHz,
+               1,  // number of channels
+               &audio_frame);
+  }
+
+  EXPECT_EQ(
+      0, memcmp(participant.fake_frame()->data_, audio_frame.data_, n_samples));
+}
+
 TEST(AudioMixer, ParticipantSampleRate) {
   const std::unique_ptr<AudioMixer> mixer(AudioMixer::Create(kId));
 
   MockMixerAudioSource participant;
   ResetFrame(participant.fake_frame());
 
   EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
   for (auto frequency : {8000, 16000, 32000, 48000}) {
     EXPECT_CALL(participant, GetAudioFrameWithMuted(_, frequency))
         .Times(Exactly(1));
@@ skipping 110 matching lines @@
   }
 
   mixer->Mix(kDefaultSampleRateHz, 1, &frame_for_mixing);
 
   // The most quiet participant should not have been mixed.
   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(participants[i].IsMixed(), true)
+    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();
+  std::unique_ptr<AudioMixer> mixer(
+      init_thread->Invoke<std::unique_ptr<AudioMixer>>(
+          RTC_FROM_HERE, std::bind(&AudioMixer::Create, kId)));
+  MockMixerAudioSource participant;
+
+  ResetFrame(participant.fake_frame());
+
+  participant_thread->Start();
+  EXPECT_EQ(0, participant_thread->Invoke<int>(
+                   RTC_FROM_HERE, rtc::Bind(&AudioMixer::SetMixabilityStatus,
+                                            mixer.get(), &participant, true)));
+
+  EXPECT_EQ(
+      0, participant_thread->Invoke<int>(
+             RTC_FROM_HERE, rtc::Bind(&AudioMixer::SetAnonymousMixabilityStatus,
+                                      mixer.get(), &participant, true)));
+
+  EXPECT_CALL(participant, GetAudioFrameWithMuted(_, kDefaultSampleRateHz))
+      .Times(Exactly(1));
+
+  // Do one mixer iteration
+  mixer->Mix(kDefaultSampleRateHz, 1, &frame_for_mixing);
+}
+
 TEST(AudioMixer, MutedShouldMixAfterUnmuted) {
   constexpr int kAudioSources =
       AudioMixer::kMaximumAmountOfMixedAudioSources + 1;
 
   std::vector<AudioFrame> frames(kAudioSources);
   for (auto& frame : frames) {
     ResetFrame(&frame);
   }
 
   std::vector<MixerAudioSource::AudioFrameInfo> frame_info(
@@ skipping 56 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