Revert of Avoiding overflow in cross correlation in NetEq.

webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc

 /*
  *  Copyright (c) 2014 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 921 matching lines @@
     EXPECT_EQ(checksum_ref, checksum_string);
 
     // Delete the output file.
     remove(output_file_name.c_str());
   }
 };
 
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) && \
     defined(WEBRTC_CODEC_ILBC) && defined(WEBRTC_CODEC_G722)
 TEST_F(AcmReceiverBitExactnessOldApi, 8kHzOutput) {
-  Run(8000, PlatformChecksum("39ef9b20cd8b58cad7e0a3d111635827",
-                             "09ef9ae4e8890a9a2f7850f7326836a0",
-                             "a607f7d0ba98683c9c236217f86aaa6b",
-                             "4a54f6ec712bda58484a388e1a332b42"),
+  Run(8000, PlatformChecksum("f34e5c0e4dd4cd6c82b23f6ed006dad0",
+                             "67a1471049dc87e7498bc19bf130dd35",
+                             "efb5a07480bad8afb184c4150f4b3f3a",
+                             "51717ab374871cbfa2c6977ea2aa40f3"),
       std::vector<ExternalDecoder>());
 }
 
 TEST_F(AcmReceiverBitExactnessOldApi, 16kHzOutput) {
-  Run(16000, PlatformChecksum("53763516a209220a209e2287f54ecae6",
-                              "37a61e657affd80c2b8f07cea9879411",
-                              "cdc3d88f6d8e497d4e00c62c0e6dbb3c",
-                              "83edb67c157d0e3a0fb9f7d7b1ce5dc7"),
+  Run(16000, PlatformChecksum("5066b412805f3050f65154d676006964",
+                              "887905a40d37f213b76f64296871473e",
+                              "f580bfd4e5e29f0399b61b7512d4e3b4",
+                              "5b2ae32c590b41d0c601179e14eaae96"),
       std::vector<ExternalDecoder>());
 }
 
 TEST_F(AcmReceiverBitExactnessOldApi, 32kHzOutput) {
-  Run(32000, PlatformChecksum("ef1a373c9d03e1832bf4eaf389b57fb7",
-                              "c7f7372441ca69858cd56b9ef4d5dcf2",
-                              "c4a0e0b2e031d62c693af2a9ff4337ac",
-                              "4cbfc6ab4d704f5d9b4f10406437fda9"),
+  Run(32000, PlatformChecksum("2cb4784af507c45b9121e2315def36f2",
+                              "d2392b3247095d894a49b74a1106f281",
+                              "fdf5166b98c43235978685e40e28fea6",
+                              "7f620312f2fa74a10048bbb7739d4bf3"),
       std::vector<ExternalDecoder>());
 }
 
 TEST_F(AcmReceiverBitExactnessOldApi, 48kHzOutput) {
-  Run(48000, PlatformChecksum("fa4bd7c1d040e710d8b93c1a1fdbd2bb",
-                              "41856a46d0604ad307df749598b6cdce",
-                              "22242dd832824046d48db9ea8a01f84c",
-                              "c7f46bf165400b266d9b57aee02d2747"),
+  Run(48000, PlatformChecksum("ce63f874a198621fa35398e412640fcf",
+                              "2cf0b8fe9784e8c96db307e125beb723",
+                              "71f89e87ee1bad594f529d6c036289ad",
+                              "b64c891e99eccc9ff45541ef67c9e9bf"),
       std::vector<ExternalDecoder>());
 }
 
 TEST_F(AcmReceiverBitExactnessOldApi, 48kHzOutputExternalDecoder) {
   // Class intended to forward a call from a mock DecodeInternal to Decode on
   // the real decoder's Decode. DecodeInternal for the real decoder isn't
   // public.
   class DecodeForwarder {
    public:
     DecodeForwarder(AudioDecoder* decoder) : decoder_(decoder) {}
@@ skipping 34 matching lines @@
       .WillRepeatedly(Invoke(&decoder, &AudioDecoderPcmU::PacketDuration));
   ExternalDecoder ed;
   ed.rtp_payload_type = 0;
   ed.external_decoder = &mock_decoder;
   ed.sample_rate_hz = 8000;
   ed.num_channels = 1;
   ed.name = "MockPCMU";
   std::vector<ExternalDecoder> external_decoders;
   external_decoders.push_back(ed);
 
-  Run(48000, PlatformChecksum("fa4bd7c1d040e710d8b93c1a1fdbd2bb",
-                              "41856a46d0604ad307df749598b6cdce",
-                              "22242dd832824046d48db9ea8a01f84c",
-                              "c7f46bf165400b266d9b57aee02d2747"),
+  Run(48000, PlatformChecksum("ce63f874a198621fa35398e412640fcf",
+                              "2cf0b8fe9784e8c96db307e125beb723",
+                              "71f89e87ee1bad594f529d6c036289ad",
+                              "b64c891e99eccc9ff45541ef67c9e9bf"),
       external_decoders);
 
   EXPECT_CALL(mock_decoder, Die());
 }
 #endif
 
 // This test verifies bit exactness for the send-side of ACM. The test setup is
 // a chain of three different test classes:
 //
 // test::AcmSendTest -> AcmSenderBitExactness -> test::AcmReceiveTest
@@ skipping 741 matching lines @@
   Run(16000, 8000, 1000);
 }
 
 TEST_F(AcmSwitchingOutputFrequencyOldApi, Toggle8KhzTo16Khz) {
   Run(8000, 16000, 1000);
 }
 
 #endif
 
 }  // namespace webrtc