diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 04:03:38 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 04:03:38 +0000 |
| commit | f5443ef7d206262bdac14b1f7d26d7dc2e753f35 (patch) | |
| tree | 23b8fe828dbd77859b33d2049e33125027871e4b /media/base/pipeline.h | |
| parent | 1f1057f9b20647adae5807c8bde06cef40cd9e42 (diff) | |
| download | chromium_src-f5443ef7d206262bdac14b1f7d26d7dc2e753f35.zip chromium_src-f5443ef7d206262bdac14b1f7d26d7dc2e753f35.tar.gz chromium_src-f5443ef7d206262bdac14b1f7d26d7dc2e753f35.tar.bz2 | |
Remove reference counting from media::Demuxer and friends.
In addition:
* Pipeline no longer owns the demuxer; clients are required to own it and keep it alive until Pipeline::Stop() completes.
BUG=173313
Review URL: https://codereview.chromium.org/13813016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.h')
| -rw-r--r-- | media/base/pipeline.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/media/base/pipeline.h b/media/base/pipeline.h index efd327d..34e36f0 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -442,8 +442,6 @@ class MEDIA_EXPORT Pipeline // Set to true in DisableAudioRendererTask(). bool audio_disabled_; - scoped_ptr<FilterCollection> filter_collection_; - // Temporary callback used for Start() and Seek(). PipelineStatusCB seek_cb_; @@ -456,14 +454,17 @@ class MEDIA_EXPORT Pipeline BufferingStateCB buffering_state_cb_; base::Closure duration_change_cb_; - // Renderer references used for setting the volume, playback rate, and - // determining when playback has finished. + // Contains the demuxer and renderers to use when initializing. + scoped_ptr<FilterCollection> filter_collection_; + + // Holds the initialized demuxer. Used for seeking. Owned by client. + Demuxer* demuxer_; + + // Holds the initialized renderers. Used for setting the volume, + // playback rate, and determining when playback has finished. scoped_ptr<AudioRenderer> audio_renderer_; scoped_ptr<VideoRenderer> video_renderer_; - // Demuxer reference used for setting the preload value. - scoped_refptr<Demuxer> demuxer_; - PipelineStatistics statistics_; // Time of pipeline creation; is non-zero only until the pipeline first |