Clamp AudioBuffer float to int{16,32} conversion

media/base/audio_bus_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 
 #include "base/macros.h"
@@ skipping 234 matching lines @@
   bus->Zero();
   for (int i = 0; i < bus->channels(); ++i) {
     SCOPED_TRACE("All Zero");
     VerifyValue(bus->channel(i), bus->frames(), 0);
   }
   EXPECT_TRUE(bus->AreFramesZero());
 }
 
 // Each test vector represents two channels of data in the following arbitrary
 // layout: <min, zero, max, min, max / 2, min / 2, zero, max, zero, zero>.
+// The max / 2 values have 0.5 added to them to round them to the nearest int.
 static const int kTestVectorSize = 10;
 static const uint8_t kTestVectorUint8[kTestVectorSize] = {
-    0,         -INT8_MIN,          UINT8_MAX,
-    0,         INT8_MAX / 2 + 128, INT8_MIN / 2 + 128,
-    -INT8_MIN, UINT8_MAX,          -INT8_MIN,
+    0,
+    -INT8_MIN,
+    UINT8_MAX,
+    0,
+    (INT8_MAX / 2.0 + 0.5) + 128,
+    (INT8_MIN / 2.0) + 128,
+    -INT8_MIN,
+    UINT8_MAX,
+    -INT8_MIN,
     -INT8_MIN};
 static const int16_t kTestVectorInt16[kTestVectorSize] = {
-    INT16_MIN,     0, INT16_MAX, INT16_MIN, INT16_MAX / 2,
-    INT16_MIN / 2, 0, INT16_MAX, 0,         0};
+    INT16_MIN,       0, INT16_MAX, INT16_MIN, INT16_MAX / 2.0 + 0.5,
+    INT16_MIN / 2.0, 0, INT16_MAX, 0,         0};
 static const int32_t kTestVectorInt32[kTestVectorSize] = {
-    INT32_MIN,     0, INT32_MAX, INT32_MIN, INT32_MAX / 2,
-    INT32_MIN / 2, 0, INT32_MAX, 0,         0};
+    INT32_MIN,       0, INT32_MAX, INT32_MIN, INT32_MAX / 2.0 + 0.5,
+    INT32_MIN / 2.0, 0, INT32_MAX, 0,         0};
 
 // Expected results.
 static const int kTestVectorFrames = kTestVectorSize / 2;
 static const float kTestVectorResult[][kTestVectorFrames] = {
     { -1, 1, 0.5, 0, 0 }, { 0, -1, -0.5, 1, 0 }};
 static const int kTestVectorChannels = arraysize(kTestVectorResult);
 
 // Verify FromInterleaved() deinterleaves audio in supported formats correctly.
 TEST_F(AudioBusTest, FromInterleaved) {
   scoped_ptr<AudioBus> bus = AudioBus::Create(
@@ skipping 82 matching lines @@
   }
   {
     SCOPED_TRACE("int32_t");
     int32_t test_array[arraysize(kTestVectorInt32)];
     bus->ToInterleaved(bus->frames(), sizeof(*kTestVectorInt32), test_array);
 
     // Some compilers get better precision than others on the half-max test, so
     // let the test pass with an off by one check on the half-max.
     int32_t fixed_test_array[arraysize(kTestVectorInt32)];
     memcpy(fixed_test_array, kTestVectorInt32, sizeof(kTestVectorInt32));
-    ASSERT_EQ(fixed_test_array[4], std::numeric_limits<int32_t>::max() / 2);
+    ASSERT_EQ(
+        fixed_test_array[4],
+        round(static_cast<double>(std::numeric_limits<int32_t>::max() / 2.0)));
     fixed_test_array[4]++;
 
     ASSERT_TRUE(
-       memcmp(test_array, kTestVectorInt32, sizeof(kTestVectorInt32)) == 0 ||
-       memcmp(test_array, fixed_test_array, sizeof(fixed_test_array)) == 0);
+        memcmp(test_array, kTestVectorInt32, sizeof(kTestVectorInt32)) == 0 ||
+        memcmp(test_array, fixed_test_array, sizeof(fixed_test_array)) == 0);
   }
 }
 
 // Verify ToInterleavedPartial() interleaves audio correctly.
 TEST_F(AudioBusTest, ToInterleavedPartial) {
   // Only interleave the middle two frames in each channel.
   static const int kPartialStart = 1;
   static const int kPartialFrames = 2;
   ASSERT_LE(kPartialStart + kPartialFrames, kTestVectorFrames);
 
@@ skipping 37 matching lines @@
 
   // Verify zero volume case.
   bus->Scale(0);
   for (int i = 0; i < bus->channels(); ++i) {
     SCOPED_TRACE("Zero Scale");
     VerifyValue(bus->channel(i), bus->frames(), 0);
   }
 }
 
 }  // namespace media