Introducing DecoderBuffer and general Buffer cleanup.

media/filters/ffmpeg_audio_decoder.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 "media/filters/ffmpeg_audio_decoder.h"
 
 #include "base/bind.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/data_buffer.h"
+#include "media/base/decoder_buffer.h"
 #include "media/base/demuxer.h"
 #include "media/base/pipeline.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 namespace media {
 
 // Returns true if the decode result was an error.
 static bool IsErrorResult(int result, int decoded_size) {
   return result < 0 ||
       decoded_size < 0 ||
@@ skipping 141 matching lines @@
 
 void FFmpegAudioDecoder::DoRead(const ReadCB& read_cb) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(!read_cb.is_null());
   CHECK(read_cb_.is_null()) << "Overlapping decodes are not supported.";
 
   read_cb_ = read_cb;
   ReadFromDemuxerStream();
 }
 
-void FFmpegAudioDecoder::DoDecodeBuffer(const scoped_refptr<Buffer>& input) {
+void FFmpegAudioDecoder::DoDecodeBuffer(
+    const scoped_refptr<DecoderBuffer>& input) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(!read_cb_.is_null());
 
   if (!input) {
     // DemuxeStream::Read() was aborted so we abort the decoder's pending read.
     DeliverSamples(NULL);
     return;
   }
 
   // FFmpeg tends to seek Ogg audio streams in the middle of nowhere, giving us
   // a whole bunch of AV_NOPTS_VALUE packets.  Discard them until we find
   // something valid.  Refer to http://crbug.com/49709
   if (input->GetTimestamp() == kNoTimestamp() &&
       estimated_next_timestamp_ == kNoTimestamp() &&
       !input->IsEndOfStream()) {
     ReadFromDemuxerStream();
     return;
   }
 
   AVPacket packet;
   av_init_packet(&packet);
-  if (input->IsEndOfStream()) {
-    packet.data = NULL;
-    packet.size = 0;
-  } else {
-    packet.data = const_cast<uint8*>(input->GetData());
-    packet.size = input->GetDataSize();
-  }
+  packet.data = const_cast<uint8*>(input->GetData());
+  packet.size = input->GetDataSize();
 
   PipelineStatistics statistics;
   statistics.audio_bytes_decoded = input->GetDataSize();
 
   int decoded_audio_size = decoded_audio_size_;
   int result = avcodec_decode_audio3(
       codec_context_, reinterpret_cast<int16_t*>(decoded_audio_),
       &decoded_audio_size, &packet);
 
   if (IsErrorResult(result, decoded_audio_size)) {
@@ skipping 39 matching lines @@
     ReadFromDemuxerStream();
   }
 }
 
 void FFmpegAudioDecoder::ReadFromDemuxerStream() {
   DCHECK(!read_cb_.is_null());
 
   demuxer_stream_->Read(base::Bind(&FFmpegAudioDecoder::DecodeBuffer, this));
 }
 
-void FFmpegAudioDecoder::DecodeBuffer(const scoped_refptr<Buffer>& buffer) {
+void FFmpegAudioDecoder::DecodeBuffer(
+    const scoped_refptr<DecoderBuffer>& buffer) {
   // TODO(scherkus): fix FFmpegDemuxerStream::Read() to not execute our read
   // callback on the same execution stack so we can get rid of forced task post.
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &FFmpegAudioDecoder::DoDecodeBuffer, this, buffer));
 }
 
 void FFmpegAudioDecoder::UpdateDurationAndTimestamp(
     const Buffer* input,
     DataBuffer* output) {
   // Always calculate duration based on the actual number of samples decoded.
@@ skipping 24 matching lines @@
 }
 
 void FFmpegAudioDecoder::DeliverSamples(const scoped_refptr<Buffer>& samples) {
   // Reset the callback before running to protect against reentrancy.
   ReadCB read_cb = read_cb_;
   read_cb_.Reset();
   read_cb.Run(samples);
 }
 
 }  // namespace media