Make PipelineImpl state change tasks consistent.

media/base/pipeline_impl.h

 // Copyright (c) 2016 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_IMPL_H_
 #define MEDIA_BASE_PIPELINE_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 14 matching lines @@
 
 // Pipeline runs the media pipeline.  Filters are created and called on the
 // task runner injected into this object. Pipeline works like a state
 // machine to perform asynchronous initialization, pausing, seeking and playing.
 //
 // Here's a state diagram that describes the lifetime of this object.
 //
 //   [ *Created ]                       [ Any State ]
 //         | Start()                         | Stop() / SetError()
 //         V                                 V
-//   [ InitXXX (for each filter) ]      [ Stopping ]
+//   [ Starting ]                       [ Stopping ]
 //         |                                 |
 //         V                                 V
 //   [ Playing ] <---------.            [ Stopped ]
 //     |     | Seek()      |
 //     |     V             |
 //     |   [ Seeking ] ----'
 //     |                   ^
 //     | Suspend()         |
 //     V                   |
 //   [ Suspending ]        |
@@ skipping 61 matching lines @@
 
  private:
   friend class MediaLog;
   class RendererWrapper;
 
   // Pipeline states, as described above.
   // TODO(alokp): Move this to RendererWrapper after removing the references
   // from MediaLog.
   enum State {
     kCreated,
-    kInitDemuxer,
-    kInitRenderer,
+    kStarting,
     kSeeking,
     kPlaying,
     kStopping,
     kStopped,
     kSuspending,
     kSuspended,
     kResuming,
   };
   static const char* GetStateString(State state);
 
   // Notifications from RendererWrapper.
   void OnError(PipelineStatus error);
   void OnEnded();
   void OnMetadata(PipelineMetadata metadata);
   void OnBufferingStateChange(BufferingState state);
   void OnDurationChange(base::TimeDelta duration);
   void OnAddTextTrack(const TextTrackConfig& config,
                       const AddTextTrackDoneCB& done_cb);
   void OnWaitingForDecryptionKey();
   void OnVideoNaturalSizeChange(const gfx::Size& size);
   void OnVideoOpacityChange(bool opaque);
 
   // Task completion callbacks from RendererWrapper.
-  void OnSeekDone(base::TimeDelta start_time);
-  void OnSuspendDone(base::TimeDelta suspend_time);
+  void OnSeekDone();
+  void OnSuspendDone();
 
   // Parameters passed in the constructor.
   const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
   const scoped_refptr<MediaLog> media_log_;
 
   // Pipeline client. Valid only while the pipeline is running.
   Client* client_;
 
   // RendererWrapper instance that runs on the media thread.
   std::unique_ptr<RendererWrapper> renderer_wrapper_;
@@ skipping 19 matching lines @@
 
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<PipelineImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_IMPL_H_