diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 22:33:47 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 22:33:47 +0000 |
| commit | 7dd4c740735765a73f2b58e6518eed446730862b (patch) | |
| tree | 51f02622aace9a0337e8823c5b502e15523f8d40 /media/base/audio_renderer.h | |
| parent | cc2ba3a7e0fda5e0fd6916ff4f450d14e2fc379b (diff) | |
| download | chromium_src-7dd4c740735765a73f2b58e6518eed446730862b.zip chromium_src-7dd4c740735765a73f2b58e6518eed446730862b.tar.gz chromium_src-7dd4c740735765a73f2b58e6518eed446730862b.tar.bz2 | |
Remove reference counting from media::AudioDecoder and friends.
This also changes AudioRenderer to no longer accept a list of AudioDecoders during Initialize(). Instead we now pass them into AudioRendererImpl during construction.
BUG=173313
Review URL: https://codereview.chromium.org/12964004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/audio_renderer.h')
| -rw-r--r-- | media/base/audio_renderer.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h index 4ddeee0..36e0236 100644 --- a/media/base/audio_renderer.h +++ b/media/base/audio_renderer.h @@ -5,8 +5,6 @@ #ifndef MEDIA_BASE_AUDIO_RENDERER_H_ #define MEDIA_BASE_AUDIO_RENDERER_H_ -#include <list> - #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/time.h" @@ -15,13 +13,10 @@ namespace media { -class AudioDecoder; class DemuxerStream; class MEDIA_EXPORT AudioRenderer { public: - typedef std::list<scoped_refptr<AudioDecoder> > AudioDecoderList; - // First parameter is the current time that has been rendered. // Second parameter is the maximum time value that the clock cannot exceed. typedef base::Callback<void(base::TimeDelta, base::TimeDelta)> TimeCB; @@ -29,8 +24,8 @@ class MEDIA_EXPORT AudioRenderer { AudioRenderer(); virtual ~AudioRenderer(); - // Initialize a AudioRenderer with the given AudioDecoder, executing the - // |init_cb| upon completion. + // Initialize an AudioRenderer with |stream|, executing |init_cb| upon + // completion. // // |statistics_cb| is executed periodically with audio rendering stats. // @@ -49,7 +44,6 @@ class MEDIA_EXPORT AudioRenderer { // // |error_cb| is executed if an error was encountered. virtual void Initialize(const scoped_refptr<DemuxerStream>& stream, - const AudioDecoderList& decoders, const PipelineStatusCB& init_cb, const StatisticsCB& statistics_cb, const base::Closure& underflow_cb, |