Simplifications of the mixing algorithm.

webrtc/modules/audio_mixer/audio_mixer_impl.h

 /*
  *  Copyright (c) 2012 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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
 
 #include <list>
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/audio_mixer/audio_mixer.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/voice_engine/level_indicator.h"
 
 namespace webrtc {
 class AudioProcessing;
 class CriticalSectionWrapper;
 
-struct FrameAndMuteInfo {
-  FrameAndMuteInfo(AudioFrame* f, bool m) : frame(f), muted(m) {}
-  AudioFrame* frame;
-  bool muted;
-};
-
-typedef std::list<FrameAndMuteInfo> AudioFrameList;

[aleloi, 2016/08/31 11:34:29]

Mixing structure is a little simplified. Mute information is only used
inside of Get*AnonymousAudio. Muted frames are filtered out one step
earlier. Therefore a |muted| field is no longer needed here, and the
FrameAndMuteInfo struct can be replaced by a single frame.

+typedef std::list<AudioFrame*> AudioFrameList;

[ivoc, 2016/08/31 15:01:06]

I think list is in many cases less efficient than vector (mostly due to
caching), are we sure that list is the right choice here? If you're interested
there's an interesting talk by Bjarne Stroustrup on the topic:
https://www.youtube.com/watch?v=YQs6IC-vgmo

[aleloi, 2016/08/31 15:25:34]

Will watch!

I think the right way is to make a performance test with lots of participants
and see what performs better. In addition: our typical use case should be a
small number of participants, so we may want the structure that performs best at
small sizes.

The list has been here since the beginning. I thought it was because of the
removals in SetMixedStatus(..., false). But maybe vectors are better anyway.

[aleloi, 2016/09/01 13:20:43]

Got convinced by watching. Changed to vector.

 typedef std::list<MixerAudioSource*> MixerAudioSourceList;
 
 // Cheshire cat implementation of MixerAudioSource's non virtual functions.
 class NewMixHistory {
  public:
   NewMixHistory();
   ~NewMixHistory();
 
   // Returns true if the audio source is being mixed.
   bool IsMixed() const;
@@ skipping 33 matching lines @@
            size_t number_of_channels,
            AudioFrame* audio_frame_for_mixing) override;
   bool AnonymousMixabilityStatus(
       const MixerAudioSource& audio_source) const override;
 
  private:
   // Set/get mix frequency
   int32_t SetOutputFrequency(const Frequency& frequency);
   Frequency OutputFrequency() const;
 
-  // Compute what audio sources to mix from audio_source_list_. Ramp in
-  // and out. Update mixed status. maxAudioFrameCounter specifies how
-  // many participants are allowed to be mixed.
-  AudioFrameList UpdateToMix(size_t maxAudioFrameCounter) const
-      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+  // Compute what audio sources to mix from audio_source_list_. Ramp
+  // in and out. Update mixed status. Mixes up to
+  // kMaximumAmountOfMixedAudioSources audio sources.
+  AudioFrameList GetNonAnonymousAudio() const EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Return the lowest mixing frequency that can be used without having to
   // downsample any audio.
   int32_t GetLowestMixingFrequency() const;
   int32_t GetLowestMixingFrequencyFromList(
       const MixerAudioSourceList& mixList) const;
 
-  // Return the AudioFrames that should be mixed anonymously.
-  void GetAdditionalAudio(AudioFrameList* additionalFramesList) const
-      EXCLUSIVE_LOCKS_REQUIRED(crit_);

[aleloi, 2016/08/31 11:34:29]

Made naming and signature more consistent between the Get*Audio
methods.

+  // Return the AudioFrames that should be mixed anonymously. Ramp in
+  // and out. Update mixed status.
+  AudioFrameList GetAnonymousAudio() const EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // This function returns true if it finds the MixerAudioSource in the
   // specified list of MixerAudioSources.
   bool IsAudioSourceInList(const MixerAudioSource& audio_source,
                            const MixerAudioSourceList& audioSourceList) const;
 
   // Add/remove the MixerAudioSource to the specified
   // MixerAudioSource list.
   bool AddAudioSourceToList(MixerAudioSource* audio_source,
                             MixerAudioSourceList* audioSourceList) const;
   bool RemoveAudioSourceFromList(MixerAudioSource* removeAudioSource,
                                  MixerAudioSourceList* audioSourceList) const;
 
   // Mix the AudioFrames stored in audioFrameList into mixedAudio.
   static int32_t MixFromList(AudioFrame* mixedAudio,
                              const AudioFrameList& audioFrameList,
                              int32_t id,
                              bool use_limiter);
 
-  // Mix the AudioFrames stored in audioFrameList into mixedAudio. No
-  // record will be kept of this mix (e.g. the corresponding MixerAudioSources
-  // will not be marked as IsMixed()
-  int32_t MixAnonomouslyFromList(AudioFrame* mixedAudio,
-                                 const AudioFrameList& audioFrameList) const;
-

[aleloi, 2016/08/31 11:34:29]

Merged with MixFromList

   bool LimitMixedAudio(AudioFrame* mixedAudio) const;
 
   // Output level functions for VoEVolumeControl.
   int GetOutputAudioLevel() override;
 
   int GetOutputAudioLevelFullRange() override;
 
   std::unique_ptr<CriticalSectionWrapper> crit_;
 
   int32_t id_;
@@ skipping 20 matching lines @@
 
   // Used for inhibiting saturation in mixing.
   std::unique_ptr<AudioProcessing> limiter_;
 
   // Measures audio level for the combined signal.
   voe::AudioLevel audio_level_;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_