Use passthrough decoder for (E)AC3 formats

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 <cmath>
 
 #include "base/logging.h"
 #include "media/base/audio_bus.h"
@@ skipping 31 matching lines @@
   entries_.emplace_back(std::move(memory), size);
 }
 
 AudioBuffer::AudioBuffer(SampleFormat sample_format,
                          ChannelLayout channel_layout,
                          int channel_count,
                          int sample_rate,
                          int frame_count,
                          bool create_buffer,
                          const uint8_t* const* data,
+                         const size_t data_size,
                          const base::TimeDelta timestamp,
                          scoped_refptr<AudioBufferMemoryPool> pool)
     : sample_format_(sample_format),
       channel_layout_(channel_layout),
       channel_count_(channel_count),
       sample_rate_(sample_rate),
       adjusted_frame_count_(frame_count),
       end_of_stream_(!create_buffer && !data && !frame_count),
       timestamp_(timestamp),
       duration_(end_of_stream_
                     ? base::TimeDelta()
                     : CalculateDuration(adjusted_frame_count_, sample_rate_)),
-      data_size_(0),
+      data_size_(data_size),
       pool_(std::move(pool)) {
   CHECK_GE(channel_count_, 0);
   CHECK_LE(channel_count_, limits::kMaxChannels);
   CHECK_GE(frame_count, 0);
   DCHECK(channel_layout == CHANNEL_LAYOUT_DISCRETE ||
          ChannelLayoutToChannelCount(channel_layout) == channel_count);
 
   int bytes_per_channel = SampleFormatToBytesPerChannel(sample_format);
   DCHECK_LE(bytes_per_channel, kChannelAlignment);
 
   // Empty buffer?
   if (!create_buffer)
     return;
 
   int data_size_per_channel = frame_count * bytes_per_channel;
   if (IsPlanar(sample_format)) {
+    DCHECK(!IsBitstreamFormat()) << sample_format_;
     // Planar data, so need to allocate buffer for each channel.
     // Determine per channel data size, taking into account alignment.
     int block_size_per_channel =
         (data_size_per_channel + kChannelAlignment - 1) &
         ~(kChannelAlignment - 1);
     DCHECK_GE(block_size_per_channel, data_size_per_channel);
 
     // Allocate a contiguous buffer for all the channel data.
     data_size_ = channel_count_ * block_size_per_channel;
     if (pool_) {
@@ skipping 10 matching lines @@
       if (data)
         memcpy(channel_data_[i], data[i], data_size_per_channel);
     }
     return;
   }
 
   // Remaining formats are interleaved data.
   DCHECK(IsInterleaved(sample_format)) << sample_format_;
   // Allocate our own buffer and copy the supplied data into it. Buffer must
   // contain the data for all channels.
-  data_size_ = data_size_per_channel * channel_count_;
+  if (!IsBitstreamFormat())
+    data_size_ = data_size_per_channel * channel_count_;
+  else
+    DCHECK(data_size_ > 0);
 
   if (pool_) {
     data_ = pool_->CreateBuffer(data_size_);
   } else {
     data_.reset(static_cast<uint8_t*>(
         base::AlignedAlloc(data_size_, kChannelAlignment)));
   }
 
   channel_data_.reserve(1);
   channel_data_.push_back(data_.get());
@@ skipping 14 matching lines @@
     int sample_rate,
     int frame_count,
     const uint8_t* const* data,
     const base::TimeDelta timestamp,
     scoped_refptr<AudioBufferMemoryPool> pool) {
   // If you hit this CHECK you likely have a bug in a demuxer. Go fix it.
   CHECK_GT(frame_count, 0);  // Otherwise looks like an EOF buffer.
   CHECK(data[0]);
   return make_scoped_refptr(
       new AudioBuffer(sample_format, channel_layout, channel_count, sample_rate,
-                      frame_count, true, data, timestamp, std::move(pool)));
+                      frame_count, true, data, 0, timestamp, std::move(pool)));
 }
 
 // static
+scoped_refptr<AudioBuffer> AudioBuffer::CopyBitstreamFrom(
+    SampleFormat sample_format,
+    ChannelLayout channel_layout,
+    int channel_count,
+    int sample_rate,
+    int frame_count,
+    const uint8_t* const* data,
+    const size_t data_size,
+    const base::TimeDelta timestamp,
+    scoped_refptr<AudioBufferMemoryPool> pool) {
+  // If you hit this CHECK you likely have a bug in a demuxer. Go fix it.
+  CHECK_GT(frame_count, 0);  // Otherwise looks like an EOF buffer.
+  CHECK(data[0]);
+  return make_scoped_refptr(new AudioBuffer(
+      sample_format, channel_layout, channel_count, sample_rate, frame_count,
+      true, data, data_size, timestamp, std::move(pool)));
+}
+
+// static
 scoped_refptr<AudioBuffer> AudioBuffer::CreateBuffer(
     SampleFormat sample_format,
     ChannelLayout channel_layout,
     int channel_count,
     int sample_rate,
     int frame_count,
     scoped_refptr<AudioBufferMemoryPool> pool) {
   CHECK_GT(frame_count, 0);  // Otherwise looks like an EOF buffer.
   return make_scoped_refptr(new AudioBuffer(
       sample_format, channel_layout, channel_count, sample_rate, frame_count,
-      true, nullptr, kNoTimestamp, std::move(pool)));
+      true, nullptr, 0, kNoTimestamp, std::move(pool)));
 }
 
 // static
+scoped_refptr<AudioBuffer> AudioBuffer::CreateBitstreamBuffer(
+    SampleFormat sample_format,
+    ChannelLayout channel_layout,
+    int channel_count,
+    int sample_rate,
+    int frame_count,
+    size_t data_size,
+    scoped_refptr<AudioBufferMemoryPool> pool) {
+  CHECK_GT(frame_count, 0);  // Otherwise looks like an EOF buffer.
+  return make_scoped_refptr(new AudioBuffer(
+      sample_format, channel_layout, channel_count, sample_rate, frame_count,
+      true, nullptr, data_size, kNoTimestamp, std::move(pool)));
+}
+
+// static
 scoped_refptr<AudioBuffer> AudioBuffer::CreateEmptyBuffer(
     ChannelLayout channel_layout,
     int channel_count,
     int sample_rate,
     int frame_count,
     const base::TimeDelta timestamp) {
   CHECK_GT(frame_count, 0);  // Otherwise looks like an EOF buffer.
   // Since data == nullptr, format doesn't matter.
   return make_scoped_refptr(new AudioBuffer(
       kSampleFormatF32, channel_layout, channel_count, sample_rate, frame_count,
-      false, nullptr, timestamp, nullptr));
+      false, nullptr, 0, timestamp, nullptr));
 }
 
 // static
 scoped_refptr<AudioBuffer> AudioBuffer::CreateEOSBuffer() {
   return make_scoped_refptr(new AudioBuffer(kUnknownSampleFormat,
                                             CHANNEL_LAYOUT_NONE, 0, 0, 0, false,
-                                            nullptr, kNoTimestamp, nullptr));
+                                            nullptr, 0, kNoTimestamp, nullptr));
 }
 
 // Convert int16_t values in the range [INT16_MIN, INT16_MAX] to [-1.0, 1.0].
 inline float ConvertSample(int16_t value) {
   return value * (value < 0 ? -1.0f / std::numeric_limits<int16_t>::min()
                             : 1.0f / std::numeric_limits<int16_t>::max());
 }
 
 void AudioBuffer::AdjustSampleRate(int sample_rate) {
   DCHECK(!end_of_stream_);
   sample_rate_ = sample_rate;
   duration_ = CalculateDuration(adjusted_frame_count_, sample_rate_);
 }
 
 void AudioBuffer::ReadFrames(int frames_to_copy,
                              int source_frame_offset,
                              int dest_frame_offset,
                              AudioBus* dest) {
   // Deinterleave each channel (if necessary) and convert to 32bit
   // floating-point with nominal range -1.0 -> +1.0 (if necessary).
 
   // |dest| must have the same number of channels, and the number of frames
   // specified must be in range.
   DCHECK(!end_of_stream());
   DCHECK_EQ(dest->channels(), channel_count_);
   DCHECK_LE(source_frame_offset + frames_to_copy, adjusted_frame_count_);
+
+  if (IsBitstreamFormat()) {
+    // TODO(tsunghung): Implement it along with AudioBus changes.
+    NOTREACHED() << "Invalid sample format!";
+  }
+
   DCHECK_LE(dest_frame_offset + frames_to_copy, dest->frames());
 
   if (!data_) {
     // Special case for an empty buffer.
     dest->ZeroFramesPartial(dest_frame_offset, frames_to_copy);
     return;
   }
 
   if (sample_format_ == kSampleFormatPlanarF32) {
     // Format is planar float32. Copy the data from each channel as a block.
@@ skipping 45 matching lines @@
   int frame_size = channel_count_ * bytes_per_channel;
   const uint8_t* source_data = data_.get() + source_frame_offset * frame_size;
   dest->FromInterleavedPartial(source_data, dest_frame_offset, frames_to_copy,
                                bytes_per_channel);
 }
 
 void AudioBuffer::TrimStart(int frames_to_trim) {
   CHECK_GE(frames_to_trim, 0);
   CHECK_LE(frames_to_trim, adjusted_frame_count_);
 
+  if (IsBitstreamFormat()) {
+    LOG(ERROR) << "Not allowed to trim an audio bitstream buffer.";
+    return;
+  }
+
   TrimRange(0, frames_to_trim);
 }
 
 void AudioBuffer::TrimEnd(int frames_to_trim) {
   CHECK_GE(frames_to_trim, 0);
   CHECK_LE(frames_to_trim, adjusted_frame_count_);
 
+  if (IsBitstreamFormat()) {
+    LOG(ERROR) << "Not allowed to trim an audio bitstream buffer.";
+    return;
+  }
+
   // Adjust the number of frames and duration for this buffer.
   adjusted_frame_count_ -= frames_to_trim;
   duration_ = CalculateDuration(adjusted_frame_count_, sample_rate_);
 }
 
 void AudioBuffer::TrimRange(int start, int end) {
   CHECK_GE(start, 0);
   CHECK_LE(end, adjusted_frame_count_);
 
+  if (IsBitstreamFormat()) {
+    LOG(ERROR) << "Not allowed to trim an audio bitstream buffer.";
+    return;
+  }
+
   const int frames_to_trim = end - start;
   CHECK_GE(frames_to_trim, 0);
   CHECK_LE(frames_to_trim, adjusted_frame_count_);
 
   const int bytes_per_channel = SampleFormatToBytesPerChannel(sample_format_);
   const int frames_to_copy = adjusted_frame_count_ - end;
   if (frames_to_copy > 0) {
     switch (sample_format_) {
       case kSampleFormatPlanarS16:
       case kSampleFormatPlanarF32:
@@ skipping 23 matching lines @@
         NOTREACHED() << "Invalid sample format!";
     }
   } else {
     CHECK_EQ(frames_to_copy, 0);
   }
 
   // Trim the leftover data off the end of the buffer and update duration.
   TrimEnd(frames_to_trim);
 }
 
+bool AudioBuffer::IsBitstreamFormat() {
+  return IsBitstream(sample_format_);
+}
+
 }  // namespace media