| 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 444891f2a0c5bf812574a1ef2fc0f300d176e7f4..4c8151d5463314549425cbee84806207332f2453 100644
|
| --- a/webrtc/modules/audio_mixer/audio_frame_manipulator.h
|
| +++ b/webrtc/modules/audio_mixer/audio_frame_manipulator.h
|
| @@ -17,7 +17,7 @@
|
| namespace webrtc {
|
|
|
| // Updates the audioFrame's energy (based on its samples).
|
| -uint32_t NewMixerCalculateEnergy(const AudioFrame& audio_frame);
|
| +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);
|
|
|