Changed ramping functionality of the AudioMixer.

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 fa7d60b805ab584cb8599edcadc753e1f6aa7210..cd5d1a197e3c639c0279d1b1f58491645d6f1424 100644
--- a/webrtc/modules/audio_mixer/audio_frame_manipulator.h
+++ b/webrtc/modules/audio_mixer/audio_frame_manipulator.h
@@ -19,9 +19,9 @@ 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 in the frame from 0 to full volume.
+void Ramp(float current, float target, AudioFrame* audio_frame);

[aleloi, 2016/10/11 10:24:08]

Moved input-only arguments to the beginning of the argument list
(https://engdoc.corp.google.com/eng/doc/devguide/cpp/styleguide.shtml?cl=head#...)

[hlundin-webrtc, 2016/10/11 11:29:58]

Acknowledged.

 
 // Downmixes or upmixes a frame between stereo and mono.
 void RemixFrame(AudioFrame* frame, size_t target_number_of_channels);