Remove AudioDecoder from the Filter heirarchy.

media/filters/ffmpeg_audio_decoder.h

 // 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
 
 #include "base/message_loop.h"
-#include "media/base/filters.h"
+#include "media/base/audio_decoder.h"
 
 struct AVCodecContext;
 
 namespace media {
 
 class DataBuffer;
 
 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
  public:
   explicit FFmpegAudioDecoder(MessageLoop* message_loop);
   virtual ~FFmpegAudioDecoder();
 
-  // Filter implementation.
-  virtual void Flush(const base::Closure& callback) OVERRIDE;
-
   // AudioDecoder implementation.
-  virtual void Initialize(DemuxerStream* stream,
+  virtual void Initialize(const scoped_refptr<DemuxerStream> stream,

[scherkus (not reviewing), 2012/02/06 21:04:04]

const-ref

[Ami GONE FROM CHROMIUM, 2012/02/06 21:38:48]

Done.

                           const PipelineStatusCB& callback,
                           const StatisticsCallback& stats_callback) OVERRIDE;
   virtual void Read(const ReadCB& callback) OVERRIDE;
   virtual int bits_per_channel() OVERRIDE;
   virtual ChannelLayout channel_layout() OVERRIDE;
   virtual int samples_per_second() OVERRIDE;
+  virtual void Reset(const base::Closure& closure) OVERRIDE;
 
  private:
   // Methods running on decoder thread.
   void DoInitialize(const scoped_refptr<DemuxerStream>& stream,
                     const PipelineStatusCB& callback,
                     const StatisticsCallback& stats_callback);
-  void DoFlush(const base::Closure& callback);
+  void DoReset(const base::Closure& closure);
   void DoRead(const ReadCB& callback);
   void DoDecodeBuffer(const scoped_refptr<Buffer>& input);
 
   // Reads from the demuxer stream with corresponding callback method.
   void ReadFromDemuxerStream();
   void DecodeBuffer(const scoped_refptr<Buffer>& buffer);
 
   // Updates the output buffer's duration and timestamp based on the input
   // buffer. Will fall back to an estimated timestamp if the input lacks a
   // valid timestamp.
@@ skipping 25 matching lines @@
   uint8* decoded_audio_;  // Allocated via av_malloc().
 
   ReadCB read_cb_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_