Convert WMPI state management to level-triggered.

media/filters/pipeline_controller.h

 // Copyright 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_FILTERS_PIPELINE_CONTROLLER_H_
 #define MEDIA_FILTERS_PIPELINE_CONTROLLER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 23 matching lines @@
     PLAYING,
     SEEKING,
     SUSPENDING,
     SUSPENDED,
     RESUMING,
   };
 
   using RendererFactoryCB = base::Callback<scoped_ptr<Renderer>(void)>;
   using SeekedCB = base::Callback<void(bool time_updated)>;
   using SuspendedCB = base::Callback<void()>;
-  using ResumedCB = base::Callback<void()>;
 
   // Construct a PipelineController wrapping |pipeline_|. |pipeline_| must
   // outlive the resulting PipelineController. The callbacks are:
   //   - |renderer_factory_cb| is called by PipelineController to create new
   //     renderers when starting and resuming.
   //   - |seeked_cb| is called upon reaching a stable state if a seek occured.
   //   - |suspended_cb| is called immediately after suspendeding.
-  //   - |resumed_cb| is called immediately after resuming.
   //   - |error_cb| is called if any operation on |pipeline_| does not result
   //     in PIPELINE_OK or its error callback is called.
   PipelineController(Pipeline* pipeline,
                      const RendererFactoryCB& renderer_factory_cb,
                      const SeekedCB& seeked_cb,
                      const SuspendedCB& suspended_cb,
-                     const ResumedCB& resumed_cb,
                      const PipelineStatusCB& error_cb);
   ~PipelineController();
 
   // Start |pipeline_|. |demuxer| will be retained and StartWaitingForSeek()/
   // CancelPendingSeek() will be issued to it as necessary.
   //
   // When |is_streaming| is true, Resume() will always start at the
   // beginning of the stream, rather than attempting to seek to the current
   // time.
   //
@@ skipping 51 matching lines @@
   RendererFactoryCB renderer_factory_cb_;
 
   // Called after seeks (which includes Start()) upon reaching a stable state.
   // Multiple seeks result in only one callback if no stable state occurs
   // between them.
   SeekedCB seeked_cb_;
 
   // Called immediately when |pipeline_| completes a suspend operation.
   SuspendedCB suspended_cb_;
 
-  // Called immediately when |pipeline_| completes a resume operation.
-  ResumedCB resumed_cb_;
-
   // Called immediately when any operation on |pipeline_| results in an error.
   PipelineStatusCB error_cb_;
 
   // State for handling StartWaitingForSeek()/CancelPendingSeek().
   Demuxer* demuxer_ = nullptr;
   bool waiting_for_seek_ = false;
 
   // When true, Resume() will start at time zero instead of seeking to the
   // current time.
   bool is_streaming_ = false;
 
   // When true, seeking to the current time may be elided.
   bool is_static_ = true;
 
   // Tracks the current state of |pipeline_|.
   State state_ = State::CREATED;
 
   // Indicates that a seek has occurred. When set, a seeked callback will be
   // issued at the next stable state.
   bool pending_seeked_cb_ = false;
 
   // Indicates that time has been changed by a seek, which will be reported at
   // the next seeked callback.
   bool pending_time_updated_ = false;
 
-  // Indicates that the |pipeline_| was suspended, and therefore that a resumed
-  // callback should be issued the next time we enter State::PLAYING.
-  bool pending_resumed_cb_ = false;
-
   // The target time of the active seek; valid while SEEKING or RESUMING.
   base::TimeDelta seek_time_;
 
   // Target state which we will work to achieve. |pending_seek_time_| is only
   // valid when |pending_seek_| is true.
   bool pending_seek_ = false;
   base::TimeDelta pending_seek_time_;
   bool pending_suspend_ = false;
   bool pending_resume_ = false;
 
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<PipelineController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PipelineController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_PIPELINE_CONTROLLER_H_