Moved MixerAudioSource and removed audio_mixer_defines.h.

webrtc/modules/audio_mixer/audio_frame_manipulator.h

Index: webrtc/modules/audio_mixer/audio_frame_manipulator.h
diff --git a/webrtc/modules/audio_mixer/audio_frame_manipulator.h b/webrtc/modules/audio_mixer/audio_frame_manipulator.h
index 4c8151d5463314549425cbee84806207332f2453..0ff21aff4e18e1e529b201b73ae6bb5c0a135b33 100644
--- a/webrtc/modules/audio_mixer/audio_frame_manipulator.h
+++ b/webrtc/modules/audio_mixer/audio_frame_manipulator.h
@@ -19,9 +19,12 @@ namespace webrtc {
 // Updates the audioFrame's energy (based on its samples).
 uint32_t AudioMixerCalculateEnergy(const AudioFrame& audio_frame);
 
-// Apply linear step function that ramps in/out the audio samples in audio_frame
-void NewMixerRampIn(AudioFrame* audio_frame);
-void NewMixerRampOut(AudioFrame* audio_frame);
+// Ramps up or down the provided audio frame. Ramp(frame, 0, 1) will
+// linearly increase the samples it frame from 0 to full volume.

[hlundin-webrtc, 2016/10/07 13:18:36]

"it frame"?

[aleloi, 2016/10/07 14:23:23]

Done.

+void Ramp(AudioFrame* audio_frame, float current, float target);
+
+// Downmixes or upmixes a frame between stereo and mono.
+void RemixFrame(AudioFrame* frame, size_t number_of_channels);

[hlundin-webrtc, 2016/10/07 13:18:36]

Rename parameter to target_number_of_channels.

[aleloi, 2016/10/07 14:23:23]

Done.

 
 }  // namespace webrtc