Rewrite media::Pipeline state transition machinery and simplify shutdown.

media/base/pipeline.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_PIPELINE_H_
 #define MEDIA_BASE_PIPELINE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 54 matching lines @@
 // machine to perform asynchronous initialization, pausing, seeking and playing.
 //
 // Here's a state diagram that describes the lifetime of this object.
 //
 //   [ *Created ]                                    [ Stopped ]
 //         | Start()                                      ^
 //         V                       SetError()             |
 //   [ InitXXX (for each filter) ] -------->[ Stopping (for each filter) ]
 //         |                                              ^
 //         V                                              | if Stop
 //   [ Seeking (for each filter) ] <--------[ Flushing (for each filter) ]

[acolwell GONE FROM CHROMIUM, 2012/09/05 13:22:22]

Needs updating

[scherkus (not reviewing), 2012/09/05 15:04:17]

Done -- feel free to suggest further improvements.

 //         |                         if Seek              ^
 //         V                                              |
 //   [ Starting (for each filter) ]                       |
 //         |                                              |
 //         V      Seek()/Stop()                           |
 //   [ Started ] -------------------------> [ Pausing (for each filter) ]
 //                                                        ^  SetError()
 //                                                        |
 //                                         [ Any State Other Than InitXXX ]
 //
@@ skipping 139 matching lines @@
   friend class base::RefCountedThreadSafe<Pipeline>;
   virtual ~Pipeline();
 
   // Pipeline states, as described above.
   enum State {
     kCreated,
     kInitDemuxer,
     kInitAudioDecoder,
     kInitAudioRenderer,
     kInitVideoRenderer,
-    kPausing,
+    kInitPrerolling,
     kSeeking,
-    kFlushing,
     kStarting,
     kStarted,
     kStopping,
     kStopped,
   };
 
   // Updates |state_|. All state transitions should use this call.
   void SetState(State next_state);
 
-  // Simple method used to make sure the pipeline is running normally.
-  bool IsPipelineOk();
-
-  // Helper method to tell whether we are in transition to seek state.
-  bool IsPipelineSeeking();
+  static const char* GetStateString(State state);
+  State GetNextState() const;
 
   // Helper method that runs & resets |seek_cb_| and resets |seek_timestamp_|
   // and |seek_pending_|.
   void FinishSeek();
 
-  // Returns true if the given state is one that transitions to a new state
-  // after iterating through each filter.
-  static bool TransientState(State state);
-
-  // Given the current state, returns the next state.
-  State FindNextState(State current);
-
   // DataSourceHost (by way of DemuxerHost) implementation.
   virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
   virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE;
   virtual void AddBufferedTimeRange(base::TimeDelta start,
                                     base::TimeDelta end) OVERRIDE;
 
   // DemuxerHost implementaion.
   virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
   virtual void OnDemuxerError(PipelineStatus error) OVERRIDE;
 
   // Initiates teardown sequence in response to a runtime error.
   //
   // Safe to call from any thread.
   void SetError(PipelineStatus error);
 
   // Callback executed when the natural size of the video has changed.
   void OnNaturalVideoSizeChanged(const gfx::Size& size);
 
   // Callbacks executed when a renderer has ended.
   void OnAudioRendererEnded();
   void OnVideoRendererEnded();
 
-  // Callbacks executed by filters upon completing initialization.
-  void OnFilterInitialize(PipelineStatus status);
-
-  // Callback executed by filters upon completing Play(), Pause(), Flush(),
-  // Seek() or Stop().
-  void OnFilterStateTransition(PipelineStatus status);
-
-  // Callback executed by filters when completing teardown operations.
-  void OnTeardownStateTransition(PipelineStatus status);
-
   // Callback executed by filters to update statistics.
   void OnUpdateStatistics(const PipelineStatistics& stats);
 
   // Callback executed by audio renderer when it has been disabled.
   void OnAudioDisabled();
 
   // Callback executed by audio renderer to update clock time.
   void OnAudioTimeUpdate(base::TimeDelta time, base::TimeDelta max_time);
 
   // Callback executed by video renderer to update clock time.
   void OnVideoTimeUpdate(base::TimeDelta max_time);
 
   // The following "task" methods correspond to the public methods, but these
   // methods are run as the result of posting a task to the PipelineInternal's
   // message loop.
   void StartTask(scoped_ptr<FilterCollection> filter_collection,
                  const PipelineStatusCB& ended_cb,
                  const PipelineStatusCB& error_cb,
                  const PipelineStatusCB& seek_cb,
                  const BufferingStateCB& buffering_state_cb);
 
-  // InitializeTask() performs initialization in multiple passes. It is executed
-  // as a result of calling Start() or InitializationComplete() that advances
-  // initialization to the next state. It works as a hub of state transition for
-  // initialization.  One stage communicates its status to the next through
-  // |last_stage_status|.
-  void InitializeTask(PipelineStatus last_stage_status);
-
   // Stops and destroys all filters, placing the pipeline in the kStopped state.
   void StopTask(const base::Closure& stop_cb);
 
   // Carries out stopping and destroying all filters, placing the pipeline in
   // the kStopped state.
   void ErrorChangedTask(PipelineStatus error);
 
   // Carries out notifying filters that the playback rate has changed.
   void PlaybackRateChangedTask(float playback_rate);
 
   // Carries out notifying filters that the volume has changed.
   void VolumeChangedTask(float volume);
 
   // Carries out notifying filters that we are seeking to a new timestamp.
   void SeekTask(base::TimeDelta time, const PipelineStatusCB& seek_cb);
 
   // Handles audio/video ended logic and running |ended_cb_|.
   void DoAudioRendererEnded();
   void DoVideoRendererEnded();
   void RunEndedCallbackIfNeeded();
 
   // Carries out disabling the audio renderer.
   void AudioDisabledTask();
 
-  // Carries out advancing to the next filter during Play()/Pause()/Seek().
-  void FilterStateTransitionTask();
-
-  // Carries out advancing to the next teardown operation.
-  void TeardownStateTransitionTask();
-
-  // Carries out stopping filter threads, deleting filters, running
-  // appropriate callbacks, and setting the appropriate pipeline state
-  // depending on whether we performing Stop() or SetError().
-  // Called after all filters have been stopped.
-  void FinishDestroyingFiltersTask();
-
-  // Internal methods used in the implementation of the pipeline thread.  All
-  // of these methods are only called on the pipeline thread.
-
-  // The following initialize methods are used to select a specific type of
-  // object from FilterCollection and initialize it asynchronously.
-  void InitializeDemuxer();
-  void OnDemuxerInitialized(PipelineStatus status);
-
-  // Returns true if the asynchronous action of creating decoder has started.
-  // Returns false if this method did nothing because the corresponding
-  // audio stream does not exist.
-  bool InitializeAudioDecoder(const scoped_refptr<Demuxer>& demuxer);
-
-  // Initializes a renderer and connects it with decoder. Returns true if the
-  // asynchronous action of creating renderer has started. Returns
-  // false if this method did nothing because the corresponding audio/video
-  // stream does not exist.
-  bool InitializeAudioRenderer(const scoped_refptr<AudioDecoder>& decoder);
-  bool InitializeVideoRenderer(
-      const scoped_refptr<DemuxerStream>& stream);
+  // 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);
 
   // Kicks off destroying filters. Called by StopTask() and ErrorChangedTask().
   // When we start to tear down the pipeline, we will consider two cases:
   // 1. when pipeline has not been initialized, we will transit to stopping
   // state first.
   // 2. when pipeline has been initialized, we will first transit to pausing
   // => flushing => stopping => stopped state.
   // This will remove the race condition during stop between filters.
   void TearDownPipeline();
 
   // Compute the time corresponding to a byte offset.
   base::TimeDelta TimeForByteOffset_Locked(int64 byte_offset) const;
 
-  // Initiates an asynchronous Pause/Seek/Play/Stop() call sequence executing
-  // |done_cb| when completed.
-  void DoPause(const PipelineStatusCB& done_cb);
-  void DoFlush(const PipelineStatusCB& done_cb);
-  void DoPlay(const PipelineStatusCB& done_cb);
-  void DoStop(const PipelineStatusCB& done_cb);
+  void OnStateTransition(PipelineStatus status);
+  void DoStateTransition(PipelineStatus status);
 
-  // Initiates an asynchronous Seek() and preroll call sequence executing
-  // |done_cb| with the final status when completed. If |skip_demuxer_seek| is
-  // true then only renderers will attempt to preroll.
+  // Initiates an asynchronous preroll call sequence executing |done_cb|
+  // with the final status when completed.
+  void DoInitialPreroll(const base::TimeDelta& seek_timestamp,

[Ami GONE FROM CHROMIUM, 2012/09/02 20:29:29]

"initial" and "seek_timestamp" seem at odds to me.
Drop the param and just use demuxer_->GetStartTime() inside?

[scherkus (not reviewing), 2012/09/05 15:04:17]

Done.

+                        const PipelineStatusCB& done_cb);
+
+  // 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, bool skip_demuxer_seek,
+  void DoSeek(const base::TimeDelta& seek_timestamp,

[Ami GONE FROM CHROMIUM, 2012/09/02 20:29:29]

this is an int64; why pass-by-ref?

[scherkus (not reviewing), 2012/09/05 15:04:17]

Habit with non-POD-types, I suppose. Done.

               const PipelineStatusCB& done_cb);
 
+  // Updates playback rate and volume and initiates an asynchronous play call
+  // sequence executing |done_cb| with the final status when completed.
+  void DoPlay(const PipelineStatusCB& done_cb);
+
+  // Initiates an asynchronous pause-flush-stop call sequence executing
+  // |done_cb| when completed.
+  void DoStop(const PipelineStatusCB& done_cb);
+  void OnStopCompleted(PipelineStatus status);
+
   void OnAudioUnderflow();
 
   void StartClockIfWaitingForTimeUpdate_Locked();
 
-  // Report pipeline |status| through |cb| avoiding duplicate error reporting.
-  void ReportStatus(const PipelineStatusCB& cb, PipelineStatus status);

[Ami GONE FROM CHROMIUM, 2012/09/02 20:29:29]

I fear this removal, but I don't think there's a bug in this CL.

[scherkus (not reviewing), 2012/09/05 15:04:17]

There isn't. Promise ;)

-
   // Message loop used to execute pipeline tasks.
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
   // MediaLog to which to log events.
   scoped_refptr<MediaLog> media_log_;
 
   // Lock used to serialize access for the following data members.
   mutable base::Lock lock_;
 
   // Whether or not the pipeline is running.
   bool running_;
 
-  // Whether or not the pipeline is in transition for a seek operation.
-  bool seek_pending_;
-
-  // Whether or not the pipeline is perform a stop operation.
-  bool tearing_down_;
-
-  // Whether or not a playback rate change should be done once seeking is done.
-  bool playback_rate_change_pending_;
-
   // Amount of available buffered data.  Set by filters.
   Ranges<int64> buffered_byte_ranges_;
   Ranges<base::TimeDelta> buffered_time_ranges_;
 
   // True when AddBufferedByteRange() has been called more recently than
   // DidLoadingProgress().
   mutable bool did_loading_progress_;
 
   // Total size of the media.  Set by filters.
   int64 total_bytes_;
 
   // Video's natural width and height.  Set by filters.
   gfx::Size natural_size_;
 
   // Current volume level (from 0.0f to 1.0f).  This value is set immediately
   // via SetVolume() and a task is dispatched on the message loop to notify the
   // filters.
   float volume_;
 
   // Current playback rate (>= 0.0f).  This value is set immediately via
   // SetPlaybackRate() and a task is dispatched on the message loop to notify
   // the filters.
   float playback_rate_;
 
-  // Playback rate to set when the current seek has finished.
-  float pending_playback_rate_;
-
   // Reference clock.  Keeps track of current playback time.  Uses system
   // clock and linear interpolation, but can have its time manually set
   // by filters.
   scoped_ptr<Clock> clock_;
 
   // If this value is set to true, then |clock_| is paused and we are waiting
   // for an update of the clock greater than or equal to the elapsed time to
   // start the clock.
   bool waiting_for_clock_update_;
 
   // Status of the pipeline.  Initialized to PIPELINE_OK which indicates that
   // the pipeline is operating correctly. Any other value indicates that the
   // pipeline is stopped or is stopping.  Clients can call the Stop() method to
   // reset the pipeline state, and restore this to PIPELINE_OK.
   PipelineStatus status_;
 
   // Whether the media contains rendered audio and video streams.
   // TODO(fischman,scherkus): replace these with checks for
   // {audio,video}_decoder_ once extraction of {Audio,Video}Decoder from the
   // Filter heirarchy is done.
   bool has_audio_;
   bool has_video_;
 
   // The following data members are only accessed by tasks posted to
   // |message_loop_|.
 
   // Member that tracks the current state.
   State state_;
 
-  // For kSeeking we need to remember where we're seeking between filter
-  // replies.
-  base::TimeDelta seek_timestamp_;
-
   // Whether we've received the audio/video ended events.
   bool audio_ended_;
   bool video_ended_;
 
   // Set to true in DisableAudioRendererTask().
   bool audio_disabled_;
 
-  // Filter collection as passed in by Start().
   scoped_ptr<FilterCollection> filter_collection_;
 
-  // Callbacks for various pipeline operations.
+  // Temporary callback used for Start() and Seek().
   PipelineStatusCB seek_cb_;
+
+  // Temporary callback used for Stop().
   base::Closure stop_cb_;
+
+  // Permanent callbacks passed in via Start().
   PipelineStatusCB ended_cb_;
   PipelineStatusCB error_cb_;
   BufferingStateCB buffering_state_cb_;
 
   // Audio renderer reference used for setting the volume and determining
   // when playback has finished.
   scoped_refptr<AudioRenderer> audio_renderer_;
 
   // Video Renderer reference used for determining when playback has finished
   // and for signalling imminent shutdown.
   // The signalling imminent shutdown is a HACK necessary because
   // WebMediaPlayerImpl::Destroy() holds the render thread loop hostage
   // until PipelineImpl::Stop() calls its callback.
   // http://crbug.com/110228 tracks removing this hack.
   scoped_refptr<VideoRenderer> video_renderer_;
 
   // Demuxer reference used for setting the preload value.
   scoped_refptr<Demuxer> demuxer_;
 
-  // Helper class that stores filter references during pipeline
-  // initialization.
-  struct PipelineInitState;
-  scoped_ptr<PipelineInitState> pipeline_init_state_;
+  // Audio decoder reference used during initialization.
+  //
+  // TODO(scherkus): Remove after renderers do initialization, see
+  // http://crbug.com/145635
+  scoped_refptr<AudioDecoder> audio_decoder_;
 
-  // Statistics.
   PipelineStatistics statistics_;
+
   // Time of pipeline creation; is non-zero only until the pipeline first
   // reaches "kStarted", at which point it is used & zeroed out.
   base::Time creation_time_;
 
   scoped_ptr<SerialRunner> pending_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(Pipeline);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_H_