Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: media/base/pipeline.h

Issue 11148011: Move audio decoder initialization to AudioRendererImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nits Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/mock_filters.cc ('k') | media/base/pipeline.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index b90f4c4e39c0f2d31f3a36e2f4f03a7475b2bbb3..12371b4e3b511e7233cbfe5746b2110d7a9684a8 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -28,7 +28,6 @@ class TimeDelta;
namespace media {
-class AudioDecoder;
class Clock;
class FilterCollection;
class MediaLog;
@@ -232,7 +231,6 @@ class MEDIA_EXPORT Pipeline
enum State {
kCreated,
kInitDemuxer,
- kInitAudioDecoder,
kInitAudioRenderer,
kInitVideoRenderer,
kInitPrerolling,
@@ -323,7 +321,6 @@ class MEDIA_EXPORT Pipeline
// Kicks off initialization for each media object, executing |done_cb| with
// the result when completed.
void InitializeDemuxer(const PipelineStatusCB& done_cb);
- void InitializeAudioDecoder(const PipelineStatusCB& done_cb);
void InitializeAudioRenderer(const PipelineStatusCB& done_cb);
void InitializeVideoRenderer(const PipelineStatusCB& done_cb);
@@ -460,12 +457,6 @@ class MEDIA_EXPORT Pipeline
// Demuxer reference used for setting the preload value.
scoped_refptr<Demuxer> demuxer_;
- // Audio decoder reference used during initialization.
- //
- // TODO(scherkus): Remove after renderers do initialization, see
- // http://crbug.com/145635
- scoped_refptr<AudioDecoder> audio_decoder_;
-
PipelineStatistics statistics_;
// Time of pipeline creation; is non-zero only until the pipeline first
« no previous file with comments | « media/base/mock_filters.cc ('k') | media/base/pipeline.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698