Adding new function ReadFrames() that returns the audio frame in planar

media/base/audio_buffer.cc

 // Copyright 2013 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 "media/base/audio_buffer.h"
 
 #include "base/logging.h"
 #include "media/base/audio_bus.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
@@ skipping 225 matching lines @@
   DCHECK(sample_format_ == kSampleFormatU8 ||
          sample_format_ == kSampleFormatS16 ||
          sample_format_ == kSampleFormatS32);
   int bytes_per_channel = SampleFormatToBytesPerChannel(sample_format_);
   int frame_size = channel_count_ * bytes_per_channel;
   const uint8* source_data = data_.get() + source_frame_offset * frame_size;
   dest->FromInterleavedPartial(
       source_data, dest_frame_offset, frames_to_copy, bytes_per_channel);
 }
 
+static inline int32 ConvertS16ToS32(int16 value) {
+  return static_cast<int32>(value) << 16;
+}
+
+static inline int32 ConvertF32ToS32(float value) {
+  return static_cast<int32>(value < 0
+                                ? (-value) * std::numeric_limits<int32>::min()
+                                : value * std::numeric_limits<int32>::max());
+}
+
+void AudioBuffer::ReadFramesInterleavedS32(int frames_to_copy,
+                                           int32* dest_data) {
+  DCHECK_LE(frames_to_copy, channel_count_ * adjusted_frame_count_);

[DaleCurtis, 2014/09/26 23:02:41]

frames_to_copy must be per channel.

[pwestin(chromium), 2014/09/29 22:54:47]

Done.

+  DCHECK_EQ(frames_to_copy % channel_count_, 0);
+

[DaleCurtis, 2014/09/26 23:02:41]

You'll need to update your frames to copy in the interleaved case to account for
multiple channels. Instead of implementing four different methods you could use
a single template function like so:

template <class Target, typename Converter>
void InterleaveToS32(const std::vector<uint8*>& channel_data,
                     int frames_to_copy,
                     int trim_start,
                     int32* dest) {
  const int total_frames = frames_to_copy * channel_data.size();
  for (int ch = 0; ch < channels; ++ch) {
    const Target* source_data =
        reinterpret_cast<const Target*>(channel_data_[ch]) + trim_start;
    for (int i = 0, offset = ch; i < total_frames;
         ++i, offset += channel_data.size()) {
      dest_data[offset] = Converter(source_data[i]);
    }
  }
}

You would call it

Interleaved:
InterleaveToS32<int16*, ConvertS16ToS32>(channel_data_, frames_to_copy *
channels, trim_start_, dest_data);

Planar:
InterleaveToS32<float*, ConvertF32ToS32>(channel_data_, frames_to_copy,
trim_start_, dest_data);

[pwestin(chromium), 2014/09/29 22:54:47]

Done.

+  switch (sample_format_) {
+    case kSampleFormatU8:
+      NOTIMPLEMENTED();
+      break;
+    case kSampleFormatS16: {
+      // Format is interleaved signed16. Convert each value into int32 and
+      // insert into output channel data.
+      const int16* source_data =
+          reinterpret_cast<const int16*>(channel_data_[0]) + trim_start_;
+
+      for (int i = 0; i < frames_to_copy; ++i) {

[DaleCurtis, 2014/09/26 23:02:41]

Typically  drop {} for one line for loops. Ditto for the ones below.

[pwestin(chromium), 2014/09/29 22:54:47]

Done.

+        dest_data[i] = ConvertS16ToS32(source_data[i]);
+      }
+    } break;

[DaleCurtis, 2014/09/26 23:02:41]

break; should be inside {}. What does clang-format do with this?

[pwestin(chromium), 2014/09/29 22:54:47]

Done.

+    case kSampleFormatS32: {
+      // Format is interleaved signed32; just copy the data.
+      const int32* source_data =
+          reinterpret_cast<const int32*>(channel_data_[0]) + trim_start_;
+      memcpy(dest_data, source_data, frames_to_copy * sizeof(int32));
+    } break;
+    case kSampleFormatF32: {
+      // Format is interleaved float. Convert each value into int32 and insert
+      // into output channel data.
+      const float* source_data =
+          reinterpret_cast<const float*>(channel_data_[0]) + trim_start_;
+      for (int i = 0; i < frames_to_copy; ++i) {
+        dest_data[i] = ConvertF32ToS32(source_data[i]);
+      }
+    } break;
+    case kSampleFormatPlanarS16: {
+      // Format is planar signed 16 bit. Convert each value into int32 and
+      // insert into output channel data.
+      for (int ch = 0; ch < channel_count_; ++ch) {
+        const int16* source_data =
+            reinterpret_cast<const int16*>(channel_data_[ch]) + trim_start_;
+
+        for (int i = 0, offset = ch; i < frames_to_copy / channel_count_;
+             ++i, offset += channel_count_) {
+          dest_data[offset] = ConvertS16ToS32(source_data[i]);
+        }
+      }
+    } break;
+    case kSampleFormatPlanarF32: {
+      // Format is planar float. Convert each value into int32 and insert into
+      // output channel data.
+      for (int ch = 0; ch < channel_count_; ++ch) {
+        const float* source_data =
+            reinterpret_cast<const float*>(channel_data_[ch]) + trim_start_;
+
+        for (int i = 0, offset = ch; i < frames_to_copy / channel_count_;
+             ++i, offset += channel_count_) {
+          dest_data[offset] = ConvertF32ToS32(source_data[i]);
+        }
+      }
+    } break;
+    case kUnknownSampleFormat:
+      NOTREACHED();
+      break;
+  }
+}
+
 void AudioBuffer::TrimStart(int frames_to_trim) {
   CHECK_GE(frames_to_trim, 0);
   CHECK_LE(frames_to_trim, adjusted_frame_count_);
 
   // Adjust the number of frames in this buffer and where the start really is.
   adjusted_frame_count_ -= frames_to_trim;
   trim_start_ += frames_to_trim;
 
   // Adjust timestamp_ and duration_ to reflect the smaller number of frames.
   const base::TimeDelta old_duration = duration_;
@@ skipping 47 matching lines @@
     }
   } else {
     CHECK_EQ(frames_to_copy, 0);
   }
 
   // Trim the leftover data off the end of the buffer and update duration.
   TrimEnd(frames_to_trim);
 }
 
 }  // namespace media