Reland "Removing webrtc::AudioFrame::energy_."

webrtc/modules/include/module_common_types.h

Index: webrtc/modules/include/module_common_types.h
diff --git a/webrtc/modules/include/module_common_types.h b/webrtc/modules/include/module_common_types.h
index 89c5f1b49b19b56a7c841eea0c25ccba5faebbd7..706eea3685a7ad928b47963baaf67b2814751767 100644
--- a/webrtc/modules/include/module_common_types.h
+++ b/webrtc/modules/include/module_common_types.h
@@ -508,7 +508,7 @@ class AudioFrame {
   void UpdateFrame(int id, uint32_t timestamp, const int16_t* data,
                    size_t samples_per_channel, int sample_rate_hz,
                    SpeechType speech_type, VADActivity vad_activity,
-                   size_t num_channels = 1, uint32_t energy = -1);
+                   size_t num_channels = 1);
 
   AudioFrame& Append(const AudioFrame& rhs);
 
@@ -535,11 +535,6 @@ class AudioFrame {
   size_t num_channels_;
   SpeechType speech_type_;
   VADActivity vad_activity_;
-  // Note that there is no guarantee that |energy_| is correct. Any user of this
-  // member must verify that the value is correct.
-  // TODO(henrike) Remove |energy_|.
-  // See https://code.google.com/p/webrtc/issues/detail?id=3315.
-  uint32_t energy_;
   bool interleaved_;
 
  private:
@@ -563,7 +558,6 @@ inline void AudioFrame::Reset() {
   num_channels_ = 0;
   speech_type_ = kUndefined;
   vad_activity_ = kVadUnknown;
-  energy_ = 0xffffffff;
   interleaved_ = true;
 }
 
@@ -574,8 +568,7 @@ inline void AudioFrame::UpdateFrame(int id,
                                     int sample_rate_hz,
                                     SpeechType speech_type,
                                     VADActivity vad_activity,
-                                    size_t num_channels,
-                                    uint32_t energy) {
+                                    size_t num_channels) {
   id_ = id;
   timestamp_ = timestamp;
   samples_per_channel_ = samples_per_channel;
@@ -583,7 +576,6 @@ inline void AudioFrame::UpdateFrame(int id,
   speech_type_ = speech_type;
   vad_activity_ = vad_activity;
   num_channels_ = num_channels;
-  energy_ = energy;
 
   const size_t length = samples_per_channel * num_channels;
   assert(length <= kMaxDataSizeSamples);
@@ -606,7 +598,6 @@ inline void AudioFrame::CopyFrom(const AudioFrame& src) {
   speech_type_ = src.speech_type_;
   vad_activity_ = src.vad_activity_;
   num_channels_ = src.num_channels_;
-  energy_ = src.energy_;
   interleaved_ = src.interleaved_;
 
   const size_t length = samples_per_channel_ * num_channels_;
@@ -701,7 +692,6 @@ inline AudioFrame& AudioFrame::operator+=(const AudioFrame& rhs) {
       data_[i] = ClampToInt16(wrap_guard);
     }
   }
-  energy_ = 0xffffffff;
   return *this;
 }
 
@@ -725,7 +715,6 @@ inline AudioFrame& AudioFrame::operator-=(const AudioFrame& rhs) {
         static_cast<int32_t>(data_[i]) - static_cast<int32_t>(rhs.data_[i]);
     data_[i] = ClampToInt16(wrap_guard);
   }
-  energy_ = 0xffffffff;
   return *this;
 }