From deee55b3d5223be4a7e5116cccbf22d1a132fac3 Mon Sep 17 00:00:00 2001 From: Piasy Xu Date: Mon, 11 Jun 2018 19:39:50 +0800 Subject: [PATCH] Calculate all audio samples in AudioMixerCalculateEnergy. Bug: None Change-Id: I1478bc6348f11d81a896a48007bc08228f4a5586 Reviewed-on: https://webrtc-review.googlesource.com/82880 Reviewed-by: Alex Loiko Commit-Queue: Alex Loiko Cr-Commit-Position: refs/heads/master@{#23787} --- modules/audio_mixer/audio_frame_manipulator.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/audio_mixer/audio_frame_manipulator.cc b/modules/audio_mixer/audio_frame_manipulator.cc index 92526a7d09..e8a5f759b0 100644 --- a/modules/audio_mixer/audio_frame_manipulator.cc +++ b/modules/audio_mixer/audio_frame_manipulator.cc @@ -21,7 +21,8 @@ uint32_t AudioMixerCalculateEnergy(const AudioFrame& audio_frame) { uint32_t energy = 0; const int16_t* frame_data = audio_frame.data(); - for (size_t position = 0; position < audio_frame.samples_per_channel_; + for (size_t position = 0; + position < audio_frame.samples_per_channel_ * audio_frame.num_channels_; position++) { // TODO(aleloi): This can overflow. Convert to floats. energy += frame_data[position] * frame_data[position];