Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / neteq / normal.cc

diff --git a/src/third_party/webrtc/modules/audio_coding/neteq/normal.cc b/src/third_party/webrtc/modules/audio_coding/neteq/normal.cc
index bfde179..46d03fb 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/neteq/normal.cc
+++ b/src/third_party/webrtc/modules/audio_coding/neteq/normal.cc
@@ -37,6 +37,11 @@ int Normal::Process(const int16_t* input,
 
   assert(output->Empty());
   // Output should be empty at this point.
+  if (length % output->Channels() != 0) {
+    // The length does not match the number of channels.
+    output->Clear();
+    return 0;
+  }
   output->PushBackInterleaved(input, length);
   int16_t* signal = &(*output)[0][0];
 
@@ -78,7 +83,11 @@ int Normal::Process(const int16_t* input,
       scaling = std::max(scaling, 0);  // |scaling| should always be >= 0.
       int32_t energy = WebRtcSpl_DotProductWithScale(signal, signal,
                                                      energy_length, scaling);
-      energy = energy / (energy_length >> scaling);
+      if ((energy_length >> scaling) > 0) {
+        energy = energy / (energy_length >> scaling);
+      } else {
+        energy = 0;
+      }
 
       int mute_factor;
       if ((energy != 0) &&