Add mute state field to AudioFrame.

webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 24 matching lines @@
                            0.8608f, 0.8734f, 0.8861f, 0.8987f,
                            0.9114f, 0.9241f, 0.9367f, 0.9494f,
                            0.9620f, 0.9747f, 0.9873f, 1.0000f};
 const size_t rampSize = sizeof(rampArray)/sizeof(rampArray[0]);
 }  // namespace
 
 namespace webrtc {
 uint32_t CalculateEnergy(const AudioFrame& audioFrame)
 {
     uint32_t energy = 0;
-    for(size_t position = 0; position < audioFrame.samples_per_channel_;
-        position++)
+    if (!audioFrame.muted())

[hlundin-webrtc, 2017/03/17 14:29:39]

I think I would prefer an early return when muted.
if (audioFrame.muted()) {
  return 0;
}

[yujo, 2017/03/17 23:55:54]

Done.

     {
-        // TODO(andrew): this can easily overflow.
-        energy += audioFrame.data_[position] * audioFrame.data_[position];
+        const int16_t* frame_data = audioFrame.data();
+        for(size_t position = 0; position < audioFrame.samples_per_channel_;
+            position++)
+        {
+            // TODO(andrew): this can easily overflow.
+            energy += frame_data[position] * frame_data[position];
+        }
     }
     return energy;
 }
 
 void RampIn(AudioFrame& audioFrame)
 {
     assert(rampSize <= audioFrame.samples_per_channel_);
-    for(size_t i = 0; i < rampSize; i++)
+    if (!audioFrame.muted())

[hlundin-webrtc, 2017/03/17 14:29:39]

Early return.

[yujo, 2017/03/17 23:55:54]

Done.

     {
-        audioFrame.data_[i] = static_cast<int16_t>(rampArray[i] *
-                                                   audioFrame.data_[i]);
+        int16_t* frame_data = audioFrame.mutable_data();
+        for(size_t i = 0; i < rampSize; i++)
+        {
+            frame_data[i] = static_cast<int16_t>(rampArray[i] * frame_data[i]);
+        }
     }
 }
 
 void RampOut(AudioFrame& audioFrame)
 {
     assert(rampSize <= audioFrame.samples_per_channel_);
-    for(size_t i = 0; i < rampSize; i++)
+    if (!audioFrame.muted())

[hlundin-webrtc, 2017/03/17 14:29:39]

Early return.

[yujo, 2017/03/17 23:55:54]

Done.

     {
-        const size_t rampPos = rampSize - 1 - i;
-        audioFrame.data_[i] = static_cast<int16_t>(rampArray[rampPos] *
-                                                   audioFrame.data_[i]);
+        int16_t* frame_data = audioFrame.mutable_data();
+        for(size_t i = 0; i < rampSize; i++)
+        {
+            const size_t rampPos = rampSize - 1 - i;
+            frame_data[i] = static_cast<int16_t>(rampArray[rampPos] *
+                                                 frame_data[i]);
+        }
+        memset(&frame_data[rampSize], 0,
+               (audioFrame.samples_per_channel_ - rampSize) *
+               sizeof(frame_data[0]));
     }
-    memset(&audioFrame.data_[rampSize], 0,
-           (audioFrame.samples_per_channel_ - rampSize) *
-           sizeof(audioFrame.data_[0]));
 }
 }  // namespace webrtc