Removing AudioMixerStatusReceiver and ParticipantStatistics

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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_
 
 #include <list>
 #include <map>
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h"
-#include "webrtc/modules/audio_conference_mixer/source/level_indicator.h"
 #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"
 #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h"
 #include "webrtc/modules/interface/module_common_types.h"
 
 namespace webrtc {
 class AudioProcessing;
 class CriticalSectionWrapper;
 
 typedef std::list<AudioFrame*> AudioFrameList;
 typedef std::list<MixerParticipant*> MixerParticipantList;
@@ skipping 33 matching lines @@
     bool Init();
 
     // Module functions
     int64_t TimeUntilNextProcess() override;
     int32_t Process() override;
 
     // AudioConferenceMixer functions
     int32_t RegisterMixedStreamCallback(
         AudioMixerOutputReceiver& mixReceiver) override;
     int32_t UnRegisterMixedStreamCallback() override;
-    int32_t RegisterMixerStatusCallback(
-        AudioMixerStatusReceiver& mixerStatusCallback,
-        const uint32_t amountOf10MsBetweenCallbacks) override;
-    int32_t UnRegisterMixerStatusCallback() override;
     int32_t SetMixabilityStatus(MixerParticipant& participant,
                                 bool mixable) override;
     int32_t MixabilityStatus(MixerParticipant& participant,
                              bool& mixable) override;
     int32_t SetMinimumMixingFrequency(Frequency freq) override;
     int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant,
                                          const bool mixable) override;
     int32_t AnonymousMixabilityStatus(MixerParticipant& participant,
                                       bool& mixable) override;
 
 private:
     enum{DEFAULT_AUDIO_FRAME_POOLSIZE = 50};
 
     // Set/get mix frequency
     int32_t SetOutputFrequency(const Frequency frequency);
     Frequency OutputFrequency() const;
 
     // Fills mixList with the AudioFrames pointers that should be used when
-    // mixing. Fills mixParticipantList with ParticipantStatistics for the
-    // participants who's AudioFrames are inside mixList.

[ajm, 2015/07/25 01:46:12]

who's -> whose

[minyue-webrtc, 2015/07/27 13:10:13]

This is a removed line

+    // 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);
@@ skipping 39 matching lines @@
         AudioFrame& mixedAudio,
         const AudioFrameList* audioFrameList);
     // 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);
 
     bool LimitMixedAudio(AudioFrame& mixedAudio);
 
-    // Scratch memory
-    // Note that the scratch memory may only be touched in the scope of
-    // Process().
-    size_t         _scratchParticipantsToMixAmount;
-    ParticipantStatistics  _scratchMixedParticipants[
-        kMaximumAmountOfMixedParticipants];
-    uint32_t         _scratchVadPositiveParticipantsAmount;
-    ParticipantStatistics  _scratchVadPositiveParticipants[
-        kMaximumAmountOfMixedParticipants];
-
     rtc::scoped_ptr<CriticalSectionWrapper> _crit;
     rtc::scoped_ptr<CriticalSectionWrapper> _cbCrit;
 
     int32_t _id;
 
     Frequency _minimumMixingFreq;
 
     // Mix result callback
     AudioMixerOutputReceiver* _mixReceiver;
 
-    AudioMixerStatusReceiver* _mixerStatusCallback;
-    uint32_t _amountOf10MsBetweenCallbacks;
-    uint32_t _amountOf10MsUntilNextCallback;
-    bool _mixerStatusCb;
-
     // The current sample frequency and sample size when mixing.
     Frequency _outputFrequency;
     uint16_t _sampleSize;
 
     // Memory pool to avoid allocating/deallocating AudioFrames
     MemoryPool<AudioFrame>* _audioFramePool;
 
     // List of all participants. Note all lists are disjunct
     MixerParticipantList _participantList;              // May be mixed.
     // Always mixed, anonomously.
     MixerParticipantList _additionalParticipantList;
 
     size_t _numMixedParticipants;
     // Determines if we will use a limiter for clipping protection during
     // mixing.
     bool use_limiter_;
 
     uint32_t _timeStamp;
 
     // Metronome class.
     TimeScheduler _timeScheduler;
 
-    // Smooth level indicator.
-    LevelIndicator _mixedAudioLevel;
-
     // 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_