From 5d36df8a13c2db628a1b123f71cc7edbecebc0a3 Mon Sep 17 00:00:00 2001 From: "scherkus@chromium.org" Date: Tue, 8 Jul 2014 01:08:03 +0000 Subject: 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 --- media/base/pipeline.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'media/base/pipeline.h') 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 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 -- cgit v1.1