Remove AudioDecoder from the Filter heirarchy.

media/base/audio_decoder.h

Index: media/base/audio_decoder.h
diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h
new file mode 100644
index 0000000000000000000000000000000000000000..621f948634fa91fda06bc6f65fd89f048a7511d7
--- /dev/null
+++ b/media/base/audio_decoder.h
@@ -0,0 +1,60 @@
+// 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_BASE_AUDIO_DECODER_H_
+#define MEDIA_BASE_AUDIO_DECODER_H_
+
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "base/time.h"

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

don't see this used

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

Done.

+#include "media/base/channel_layout.h"
+#include "media/base/demuxer_stream.h"

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

fwd declare some of these instead?

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

Done.

+#include "media/base/filters.h"
+#include "media/base/pipeline_status.h"
+#include "media/base/media_export.h"
+
+namespace media {
+
+class MEDIA_EXPORT AudioDecoder
+    : public base::RefCountedThreadSafe<AudioDecoder> {

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

AFAIK after this patch we'll be very close to replacing ref-counting with
scoped_ptr<> and Pass()

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

Yep.

+ public:
+  // Initialize a AudioDecoder with the given DemuxerStream, executing the

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

s/a/an

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

Done.

+  // callback upon completion.
+  // stats_callback is used to update global pipeline statistics.
+  virtual void Initialize(const scoped_refptr<DemuxerStream> stream,
+                          const PipelineStatusCB& callback,
+                          const StatisticsCallback& stats_callback) = 0;
+
+  // Request samples to be decoded and returned via the provided callback.
+  // Only one read may be in flight at any given time.
+  //
+  // Implementations guarantee that the callback will not be called from within
+  // this method.
+  //
+  // Non-NULL sample buffer pointers will contain decoded audio data or may
+  // indicate the end of the stream. A NULL buffer pointer indicates an aborted
+  // Read(). This can happen if the DemuxerStream gets flushed and doesn't have
+  // any more data to return.
+  typedef base::Callback<void(scoped_refptr<Buffer>)> ReadCB;
+  virtual void Read(const ReadCB& callback) = 0;
+
+  // Reset decoder state, dropping any queued encoded data.
+  virtual void Reset(const base::Closure& closure) = 0;
+
+  // Returns various information about the decoded audio format.
+  virtual int bits_per_channel() = 0;
+  virtual ChannelLayout channel_layout() = 0;
+  virtual int samples_per_second() = 0;
+
+ protected:
+  friend class base::RefCountedThreadSafe<AudioDecoder>;
+  virtual ~AudioDecoder();
+  AudioDecoder();
+
+  DISALLOW_COPY_AND_ASSIGN(AudioDecoder);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_BASE_AUDIO_DECODER_H_