Remove AudioDecoder from the Filter heirarchy.

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.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/data_buffer.h"
 #include "media/base/demuxer.h"
-#include "media/base/filter_host.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 ||
       decoded_size > AVCODEC_MAX_AUDIO_FRAME_SIZE;
@@ skipping 30 matching lines @@
       bits_per_channel_(0),
       channel_layout_(CHANNEL_LAYOUT_NONE),
       samples_per_second_(0),
       decoded_audio_size_(AVCODEC_MAX_AUDIO_FRAME_SIZE),
       decoded_audio_(static_cast<uint8*>(av_malloc(decoded_audio_size_))) {
 }
 
 FFmpegAudioDecoder::~FFmpegAudioDecoder() {
   av_free(decoded_audio_);
 
   // XXX: should we require Stop() to be called? this might end up getting

[scherkus (not reviewing), 2012/02/03 23:31:29]

can you change this to TODO(scherkus)

I use XXX as comments in the code I'm supposed to address BEFORE committing but
sometimes they slip by D:

[Ami GONE FROM CHROMIUM, 2012/02/04 00:10:21]

Done.

   // called on a random thread due to refcounting.
   if (codec_context_) {
     av_free(codec_context_->extradata);
     avcodec_close(codec_context_);
     av_free(codec_context_);
   }
 }
 
-void FFmpegAudioDecoder::Flush(const base::Closure& callback) {

[scherkus (not reviewing), 2012/02/03 23:31:29]

\o/

[Ami GONE FROM CHROMIUM, 2012/02/04 00:10:21]

Done.

-  message_loop_->PostTask(
-      FROM_HERE,
-      base::Bind(&FFmpegAudioDecoder::DoFlush, this, callback));
-}
-
 void FFmpegAudioDecoder::Initialize(
     DemuxerStream* stream,
     const PipelineStatusCB& callback,
     const StatisticsCallback& stats_callback) {
   // TODO(scherkus): change Initialize() signature to pass |stream| as a
   // scoped_refptr<>.
   scoped_refptr<DemuxerStream> ref_stream(stream);
   message_loop_->PostTask(
       FROM_HERE,
       base::Bind(&FFmpegAudioDecoder::DoInitialize, this,
@@ skipping 202 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