AudioBus: Add a ToInterleavedFloat() method to AudioBus

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 247 matching lines @@
     0,         INT8_MAX / 2 + 128, INT8_MIN / 2 + 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};
 static const int32_t kTestVectorInt32[kTestVectorSize] = {
     INT32_MIN,     0, INT32_MAX, INT32_MIN, INT32_MAX / 2,
     INT32_MIN / 2, 0, INT32_MAX, 0,         0};
 
+static const float kTestVectorFloat[kTestVectorSize] = {
+    -1.0, 0.0, 1.0, -1.0, 0.5, -0.5, 0.0, 1.0, 0.0, 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(
       kTestVectorChannels, kTestVectorFrames);
@@ skipping 90 matching lines @@
     memcpy(fixed_test_array, kTestVectorInt32, sizeof(kTestVectorInt32));
     ASSERT_EQ(fixed_test_array[4], std::numeric_limits<int32_t>::max() / 2);
     fixed_test_array[4]++;
 
     ASSERT_TRUE(
        memcmp(test_array, kTestVectorInt32, sizeof(kTestVectorInt32)) == 0 ||
        memcmp(test_array, fixed_test_array, sizeof(fixed_test_array)) == 0);
   }
 }
 
+// Verify ToInterleavedFloat interleaves |AudioBus| channels of float
+// into a single linear output buffer correctly

[mcasas, 2016/04/11 23:47:08]

s/ToInterleavedFloat/ToInterleavedFloat()/

Classes like AudioBus do not need to be 
specified |as_variable|. 

Period at the end.

+TEST_F(AudioBusTest, ToInterleavedFloat) {
+  SCOPED_TRACE("float");
+  scoped_ptr<AudioBus> bus =
+      AudioBus::Create(kTestVectorChannels, kTestVectorFrames);
+  for (int ch = 0; ch < bus->channels(); ++ch) {
+    memcpy(bus->channel(ch), kTestVectorResult[ch],
+           kTestVectorFrames * sizeof(*bus->channel(ch)));
+  }
+
+  float test_array[arraysize(kTestVectorFloat)];
+  bus->ToInterleavedFloat(0, 0, bus->frames(), test_array);
+  ASSERT_EQ(memcmp(test_array, kTestVectorFloat,

[eklavyamirani, 2016/04/04 08:11:58]

Fixed the formatting on this in my local commit. Amend the commit posted here,
or it goes as a separate patch?

[mcasas, 2016/04/11 23:47:08]

Sorry, yes, when you have addressed the
reviewers' comments, upload a new patch,
then "Publish and mail comments" please.

+                   kTestVectorFrames * sizeof(*kTestVectorFloat)),
+            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);
 
   scoped_ptr<AudioBus> expected = AudioBus::Create(
       kTestVectorChannels, kTestVectorFrames);
   for (int ch = 0; ch < kTestVectorChannels; ++ch) {
@@ skipping 34 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