Motown: Change player state machine to support preroll

services/media/factory_service/media_player_impl.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 MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_
 #define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_
 
 #include <limits>
 #include <vector>
 
@@ skipping 33 matching lines @@
   void Pause() override;
 
   void Seek(int64_t position) override;
 
  private:
   static constexpr int64_t kMinimumLeadTime = Timeline::ns_from_ms(30);
 
   // Internal state.
   enum class State {
     kWaiting,  // Waiting for some work to complete.
-    kPaused,
+    kFlushed,
+    kPrimed,
     kPlaying,
   };
 
   struct Stream {
     Stream();
     ~Stream();
     // TODO(dalesat): Have the sink enlist the decoder.
     MediaTypeConverterPtr decoder_;
     MediaSinkPtr sink_;
     // The following fields are just temporaries used to solve lambda capture
     // problems.
     MediaProducerPtr encoded_producer_;
     MediaProducerPtr decoded_producer_;
     InterfaceHandle<MediaRenderer> renderer_;
   };
 
   MediaPlayerImpl(InterfaceHandle<SeekingReader> reader,
                   InterfaceHandle<MediaRenderer> audio_renderer,
                   InterfaceHandle<MediaRenderer> video_renderer,
                   InterfaceRequest<MediaPlayer> request,
                   MediaFactoryService* owner);
 
   // Takes action based on current state.
   void Update();
 
-  // Handles seeking in paused state.
-  void WhenPausedAndSeeking();
-
-  // Handles seeking in paused state with flushed pipeline.
-  void WhenFlushedAndSeeking();
-
   // Sets the timeline transform. transform_subject_time_ is used for the
   // subject_time, and the effective_reference_time is now plus
   // kMinimumLeadTime.
   void SetTimelineTransform(uint32_t reference_delta, uint32_t subject_delta);
 
   // Prepares a stream.
   void PrepareStream(Stream* stream,
                      size_t index,
                      const MediaTypePtr& input_media_type,
                      const std::function<void()>& callback);
@@ skipping 15 matching lines @@
       uint64_t version = MediaTimelineControlSite::kInitialStatus,
       MediaTimelineControlSiteStatusPtr status = nullptr);
 
   MediaFactoryPtr factory_;
   MediaDemuxPtr demux_;
   MediaTimelineControllerPtr timeline_controller_;
   MediaTimelineControlSitePtr timeline_control_site_;
   TimelineConsumerPtr timeline_consumer_;
   std::vector<std::unique_ptr<Stream>> streams_;
   State state_ = State::kWaiting;
-  State target_state_ = State::kPaused;
-  bool flushed_ = true;
+  State target_state_ = State::kFlushed;

[kulakowski, 2016/06/20 23:04:09]

target_state_ can't take on all the values in State!

   bool end_of_stream_ = false;
   int64_t target_position_ = kUnspecifiedTime;
   int64_t transform_subject_time_ = kUnspecifiedTime;
   TimelineFunction timeline_function_;
   CallbackJoiner set_transform_joiner_;
   MediaMetadataPtr metadata_;
   MojoPublisher<GetStatusCallback> status_publisher_;
   // The following fields are just temporaries used to solve lambda capture
   // problems.
   InterfaceHandle<MediaRenderer> audio_renderer_;
   InterfaceHandle<MediaRenderer> video_renderer_;
 };
 
 }  // namespace media
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_