[MERGE TO M59] Fixing check for when overlap-add is not 1 ms

webrtc/modules/audio_coding/neteq/normal.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 127 matching lines @@
         win_slope_Q14 = (1 << 14) / static_cast<int16_t>(win_length);
       }
       int16_t win_up_Q14 = 0;
       for (size_t i = 0; i < win_length; i++) {
         win_up_Q14 += win_slope_Q14;
         (*output)[channel_ix][i] =
             (win_up_Q14 * (*output)[channel_ix][i] +
              ((1 << 14) - win_up_Q14) * expanded[channel_ix][i] + (1 << 13)) >>
             14;
       }
-      if (fs_hz_ == 48000) {
-        RTC_DCHECK_EQ(win_up_Q14, (1 << 14) - 16);
-      } else {
-        RTC_DCHECK_EQ(win_up_Q14, 1 << 14);
-      }
+      RTC_DCHECK_GT(win_up_Q14,
+                    (1 << 14) - 32);  // Worst case rouding is a length of 34
     }
   } else if (last_mode == kModeRfc3389Cng) {
     RTC_DCHECK_EQ(output->Channels(), 1);  // Not adapted for multi-channel yet.
     static const size_t kCngLength = 48;
     RTC_DCHECK_LE(8 * fs_mult, kCngLength);
     int16_t cng_output[kCngLength];
     // Reset mute factor and start up fresh.
     external_mute_factor_array[0] = 16384;
     ComfortNoiseDecoder* cng_decoder = decoder_database_->GetActiveCngDecoder();
 
@@ skipping 17 matching lines @@
       win_slope_Q14 = (1 << 14) / static_cast<int16_t>(win_length);
     }
     int16_t win_up_Q14 = 0;
     for (size_t i = 0; i < win_length; i++) {
       win_up_Q14 += win_slope_Q14;
       (*output)[0][i] =
           (win_up_Q14 * (*output)[0][i] +
            ((1 << 14) - win_up_Q14) * cng_output[i] + (1 << 13)) >>
           14;
     }
-    if (fs_hz_ == 48000) {
-      RTC_DCHECK_EQ(win_up_Q14, (1 << 14) - 16);
-    } else {
-      RTC_DCHECK_EQ(win_up_Q14, 1 << 14);
-    }
+    RTC_DCHECK_GT(win_up_Q14,
+                  (1 << 14) - 32);  // Worst case rouding is a length of 34
   } else if (external_mute_factor_array[0] < 16384) {
     // Previous was neither of Expand, FadeToBGN or RFC3389_CNG, but we are
     // still ramping up from previous muting.
     // If muted increase by 0.64 for every 20 ms (NB/WB 0.0040/0.0020 in Q14).
     int increment = 64 / fs_mult;
     size_t length_per_channel = length / output->Channels();
     for (size_t i = 0; i < length_per_channel; i++) {
       for (size_t channel_ix = 0; channel_ix < output->Channels();
           ++channel_ix) {
         // Scale with mute factor.
         RTC_DCHECK_LT(channel_ix, output->Channels());
         RTC_DCHECK_LT(i, output->Size());
         int32_t scaled_signal = (*output)[channel_ix][i] *
             external_mute_factor_array[channel_ix];
         // Shift 14 with proper rounding.
         (*output)[channel_ix][i] =
             static_cast<int16_t>((scaled_signal + 8192) >> 14);
         // Increase mute_factor towards 16384.
         external_mute_factor_array[channel_ix] = static_cast<int16_t>(std::min(
             16384, external_mute_factor_array[channel_ix] + increment));
       }
     }
   }
 
   return static_cast<int>(length);
 }
 
 }  // namespace webrtc