| commit | 36542514f6a0738d0322647ccc920f2a0ba19c01 | [log] [tgz] |
|---|---|---|
| author | aleloi <aleloi@webrtc.org> | Fri Oct 07 05:28:32 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Oct 07 12:28:38 2016 +0000 |
| tree | c081af38a47921c553d17c64fb571e2224491579 | |
| parent | a485dabc7869c35c7d5a8a377e518603012ffa48 [diff] [blame] |
Reland of https://codereview.webrtc.org/2396483002/ LOG_T_F macro is not defined for chromium builds. NOTRY=True BUG=webrtc:6346 TBR=ivoc@webrtc.org Review-Url: https://codereview.webrtc.org/2401603003 Cr-Commit-Position: refs/heads/master@{#14569}
diff --git a/webrtc/modules/audio_mixer/audio_frame_manipulator.h b/webrtc/modules/audio_mixer/audio_frame_manipulator.h index 444891f..4c8151d 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);