diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 01:08:03 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 01:08:03 +0000 |
| commit | 5d36df8a13c2db628a1b123f71cc7edbecebc0a3 (patch) | |
| tree | 03061deb8d45c2d2d59abf8ec217c02c8f5e4332 /media/base/pipeline.h | |
| parent | ce782be8ffabb8d2a5ef03cd090e255b3d9ca4e2 (diff) | |
| download | chromium_src-5d36df8a13c2db628a1b123f71cc7edbecebc0a3.zip chromium_src-5d36df8a13c2db628a1b123f71cc7edbecebc0a3.tar.gz chromium_src-5d36df8a13c2db628a1b123f71cc7edbecebc0a3.tar.bz2 | |
Fold Pipeline's initial prerolling state into the playing state.
It's no longer needed now that all renderers have moved towards
buffering state callbacks.
BUG=144683
Review URL: https://codereview.chromium.org/361243007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.h')
| -rw-r--r-- | media/base/pipeline.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/media/base/pipeline.h b/media/base/pipeline.h index f042548..3d25b8e 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -59,10 +59,7 @@ typedef base::Callback<void(PipelineMetadata)> PipelineMetadataCB; // [ InitXXX (for each filter) ] [ Stopping ] // | | // V V -// [ InitPrerolling ] [ Stopped ] -// | -// V -// [ Playing ] <-- [ Seeking ] +// [ Playing ] <-- [ Seeking ] [ Stopped ] // | ^ // `---------------' // Seek() @@ -194,7 +191,6 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost { kInitDemuxer, kInitAudioRenderer, kInitVideoRenderer, - kInitPrerolling, kSeeking, kPlaying, kStopping, @@ -296,10 +292,6 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost { // Initiates an asynchronous pause-flush-seek-preroll call sequence // executing |done_cb| with the final status when completed. - // - // TODO(scherkus): Prerolling should be separate from seeking so we can report - // finer grained ready states (HAVE_CURRENT_DATA vs. HAVE_FUTURE_DATA) - // indepentent from seeking. void DoSeek(base::TimeDelta seek_timestamp, const PipelineStatusCB& done_cb); // Initiates an asynchronous pause-flush-stop call sequence executing |