Stylizing AudioConferenceMixer.

webrtc/modules/audio_conference_mixer/source/audio_conference_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.
  */
 
@@ skipping 18 matching lines @@
 typedef std::list<MixerParticipant*> MixerParticipantList;
 
 // Cheshire cat implementation of MixerParticipant's non virtual functions.
 class MixHistory
 {
 public:
     MixHistory();
     ~MixHistory();
 
     // MixerParticipant function
-    int32_t IsMixed(bool& mixed) const;
+    int32_t IsMixed(bool* mixed) const;

[Andrew MacDonald, 2015/08/26 15:56:01]

Return bool on both of these?

[minyue-webrtc, 2015/08/27 11:31:15]

Done.

 
     // Sets wasMixed to true if the participant was mixed previous mix
     // iteration.
-    int32_t WasMixed(bool& wasMixed) const;
+    int32_t WasMixed(bool* wasMixed) const;
 
     // Updates the mixed status.
     int32_t SetIsMixed(const bool mixed);
 
     void ResetMixedStatus();
 private:
     bool _isMixed;
 };
 
 class AudioConferenceMixerImpl : public AudioConferenceMixer
 {
 public:
     // AudioProcessing only accepts 10 ms frames.
     enum {kProcessPeriodicityInMs = 10};
 
     AudioConferenceMixerImpl(int id);
     ~AudioConferenceMixerImpl();
 
     // Must be called after ctor.
     bool Init();
 
     // Module functions
     int64_t TimeUntilNextProcess() override;
     int32_t Process() override;
 
     // AudioConferenceMixer functions
     int32_t RegisterMixedStreamCallback(
-        AudioMixerOutputReceiver& mixReceiver) override;
+        AudioMixerOutputReceiver* mixReceiver) override;
     int32_t UnRegisterMixedStreamCallback() override;
-    int32_t SetMixabilityStatus(MixerParticipant& participant,
+    int32_t SetMixabilityStatus(MixerParticipant* participant,
                                 bool mixable) override;
-    int32_t MixabilityStatus(MixerParticipant& participant,
-                             bool& mixable) override;
+    int32_t MixabilityStatus(const MixerParticipant& participant,
+                             bool* mixable) const override;
     int32_t SetMinimumMixingFrequency(Frequency freq) override;
-    int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant,
-                                         const bool mixable) override;
-    int32_t AnonymousMixabilityStatus(MixerParticipant& participant,
-                                      bool& mixable) override;
+    int32_t SetAnonymousMixabilityStatus(
+        MixerParticipant* participant, bool mixable) override;
+    int32_t AnonymousMixabilityStatus(const MixerParticipant& participant,
+                                      bool* mixable) const override;
 
 private:
     enum{DEFAULT_AUDIO_FRAME_POOLSIZE = 50};
 
     // Set/get mix frequency
-    int32_t SetOutputFrequency(const Frequency frequency);
+    int32_t SetOutputFrequency(const Frequency& frequency);
     Frequency OutputFrequency() const;
 
     // Fills mixList with the AudioFrames pointers that should be used when
     // mixing.
     // maxAudioFrameCounter both input and output specifies how many more
     // AudioFrames that are allowed to be mixed.
     // rampOutList contain AudioFrames corresponding to an audio stream that
     // used to be mixed but shouldn't be mixed any longer. These AudioFrames
     // should be ramped out over this AudioFrame to avoid audio discontinuities.
     void UpdateToMix(
         AudioFrameList* mixList,
         AudioFrameList* rampOutList,
         std::map<int, MixerParticipant*>* mixParticipantList,
-        size_t& maxAudioFrameCounter);
+        size_t* maxAudioFrameCounter) const;
 
     // Return the lowest mixing frequency that can be used without having to
     // downsample any audio.
-    int32_t GetLowestMixingFrequency();
-    int32_t GetLowestMixingFrequencyFromList(MixerParticipantList* mixList);
+    int32_t GetLowestMixingFrequency() const;
+    int32_t GetLowestMixingFrequencyFromList(
+        const MixerParticipantList* mixList) const;

[Andrew MacDonald, 2015/08/26 15:56:01]

const reference

[minyue-webrtc, 2015/08/27 11:31:15]

Done.

 
     // Return the AudioFrames that should be mixed anonymously.
-    void GetAdditionalAudio(AudioFrameList* additionalFramesList);
+    void GetAdditionalAudio(AudioFrameList* additionalFramesList) const;
 
     // Update the MixHistory of all MixerParticipants. mixedParticipantsList
     // should contain a map of MixerParticipants that have been mixed.
     void UpdateMixedStatus(
-        std::map<int, MixerParticipant*>& mixedParticipantsList);
+        const std::map<int, MixerParticipant*>& mixedParticipantsList) const;
 
     // Clears audioFrameList and reclaims all memory associated with it.
-    void ClearAudioFrameList(AudioFrameList* audioFrameList);
+    void ClearAudioFrameList(AudioFrameList* audioFrameList) const;
 
     // Update the list of MixerParticipants who have a positive VAD. mixList
     // should be a list of AudioFrames
-    void UpdateVADPositiveParticipants(
-        AudioFrameList* mixList);
+    void UpdateVADPositiveParticipants(AudioFrameList* mixList) const;
 
     // This function returns true if it finds the MixerParticipant in the
     // specified list of MixerParticipants.
-    bool IsParticipantInList(
-        MixerParticipant& participant,
-        MixerParticipantList* participantList) const;
+    bool IsParticipantInList(const MixerParticipant& participant,
+                             const MixerParticipantList* participantList) const;

[Andrew MacDonald, 2015/08/26 15:56:01]

const reference

[minyue-webrtc, 2015/08/27 11:31:15]

Done.

 
     // Add/remove the MixerParticipant to the specified
     // MixerParticipant list.
     bool AddParticipantToList(
-        MixerParticipant& participant,
-        MixerParticipantList* participantList);
+        MixerParticipant* participant,
+        MixerParticipantList* participantList) const;
     bool RemoveParticipantFromList(
-        MixerParticipant& removeParticipant,
-        MixerParticipantList* participantList);
+        MixerParticipant* removeParticipant,
+        MixerParticipantList* participantList) const;
 
     // Mix the AudioFrames stored in audioFrameList into mixedAudio.
-    int32_t MixFromList(
-        AudioFrame& mixedAudio,
-        const AudioFrameList* audioFrameList);
+    int32_t MixFromList(AudioFrame* mixedAudio,
+                        const AudioFrameList* audioFrameList) const;

[Andrew MacDonald, 2015/08/26 15:56:01]

const reference

[minyue-webrtc, 2015/08/27 11:31:15]

Done.

+
     // Mix the AudioFrames stored in audioFrameList into mixedAudio. No
     // record will be kept of this mix (e.g. the corresponding MixerParticipants
     // will not be marked as IsMixed()
-    int32_t MixAnonomouslyFromList(AudioFrame& mixedAudio,
-                                   const AudioFrameList* audioFrameList);
+    int32_t MixAnonomouslyFromList(AudioFrame* mixedAudio,
+                                   const AudioFrameList* audioFrameList) const;

[Andrew MacDonald, 2015/08/26 15:56:01]

const reference

[minyue-webrtc, 2015/08/27 11:31:15]

Done.

 
-    bool LimitMixedAudio(AudioFrame& mixedAudio);
+    bool LimitMixedAudio(AudioFrame* mixedAudio) const;
 
     rtc::scoped_ptr<CriticalSectionWrapper> _crit;
     rtc::scoped_ptr<CriticalSectionWrapper> _cbCrit;
 
     int32_t _id;
 
     Frequency _minimumMixingFreq;
 
     // Mix result callback
     AudioMixerOutputReceiver* _mixReceiver;
@@ skipping 23 matching lines @@
     // Counter keeping track of concurrent calls to process.
     // Note: should never be higher than 1 or lower than 0.
     int16_t _processCalls;
 
     // Used for inhibiting saturation in mixing.
     rtc::scoped_ptr<AudioProcessing> _limiter;
 };
 }  // namespace webrtc
 
 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_