A simple copy of the old mixer to a new directory. I also plan to run 'git cl format'. In another C…

webrtc/modules/audio_mixer/audio_mixer.h

Index: webrtc/modules/audio_mixer/audio_mixer.h
diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/modules/audio_mixer/audio_mixer.h
similarity index 85%
copy from webrtc/voice_engine/output_mixer.h
copy to webrtc/modules/audio_mixer/audio_mixer.h
index ae2f53fdb9d7d8197b89c25b0c2a554e8fcfcd93..e74c7a814609e758a8fb01122de9540ade95eef7 100644
--- a/webrtc/voice_engine/output_mixer.h
+++ b/webrtc/modules/audio_mixer/audio_mixer.h
@@ -14,8 +14,8 @@
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_types.h"
-#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"
-#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
+#include "webrtc/modules/audio_mixer/include/audio_conference_mixer.h"
+#include "webrtc/modules/audio_mixer/include/audio_conference_mixer_defines.h"
 #include "webrtc/modules/utility/include/file_recorder.h"
 #include "webrtc/voice_engine/level_indicator.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
@@ -27,16 +27,15 @@ class FileWrapper;
 class VoEMediaProcess;
 
 namespace voe {
-
 class Statistics;
 
-class OutputMixer : public AudioMixerOutputReceiver,
+class AudioMixer : public AudioMixerOutputReceiver,
                     public FileCallback

[ivoc, 2016/07/01 07:56:27]

You may want to rerun git cl format, I think this should be shifted one space to
the left

 {
 public:
-    static int32_t Create(OutputMixer*& mixer, uint32_t instanceId);
+    static int32_t Create(AudioMixer*& mixer, uint32_t instanceId);
 
-    static void Destroy(OutputMixer*& mixer);
+    static void Destroy(AudioMixer*& mixer);
 
     int32_t SetEngineInformation(Statistics& engineStatistics);
 
@@ -53,10 +52,10 @@ public:
 
     int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);
 
-    int32_t SetMixabilityStatus(MixerParticipant& participant,
+    int32_t SetMixabilityStatus(MixerAudioSource& participant,
                                 bool mixable);
 
-    int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant,
+    int32_t SetAnonymousMixabilityStatus(MixerAudioSource& participant,
                                          bool mixable);
 
     int GetMixedAudio(int sample_rate_hz, size_t num_channels,
@@ -79,7 +78,7 @@ public:
                               const CodecInst* codecInst);
     int StopRecordingPlayout();
 
-    virtual ~OutputMixer();
+    virtual ~AudioMixer();
 
     // from AudioMixerOutputReceiver
     virtual void NewMixedAudio(
@@ -97,7 +96,7 @@ public:
     void RecordFileEnded(int32_t id);
 
 private:
-    OutputMixer(uint32_t instanceId);
+    AudioMixer(uint32_t instanceId);
 
     // uses
     Statistics* _engineStatisticsPtr;
@@ -106,7 +105,7 @@ private:
     rtc::CriticalSection _callbackCritSect;
     // protect the _outputFileRecorderPtr and _outputFileRecording
     rtc::CriticalSection _fileCritSect;
-    AudioConferenceMixer& _mixerModule;
+    NewAudioConferenceMixer& _mixerModule;
     AudioFrame _audioFrame;
     // Converts mixed audio to the audio device output rate.
     PushResampler<int16_t> resampler_;