MediaCodecPlayer implementation (stage 3 - browser seek and surface change)

media/base/android/media_codec_player.h

 // Copyright 2015 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_ANDROID_MEDIA_CODEC_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 137 matching lines @@
   // Typedefs for the notification callbacks
   typedef base::Callback<void(base::TimeDelta, const gfx::Size&)>
       MetadataChangedCallback;
 
   typedef base::Callback<void(base::TimeDelta, base::TimeTicks)>
       TimeUpdateCallback;
 
   typedef base::Callback<void(const base::TimeDelta& current_timestamp)>
       SeekDoneCallback;
 
+  typedef base::Callback<void(int)> ErrorCallback;
+
   // Constructs a player with the given ID and demuxer. |manager| must outlive
   // the lifetime of this object.
   MediaCodecPlayer(int player_id,
                    base::WeakPtr<MediaPlayerManager> manager,
                    const RequestMediaResourcesCB& request_media_resources_cb,
                    scoped_ptr<DemuxerAndroid> demuxer,
                    const GURL& frame_url);
   ~MediaCodecPlayer() override;
 
   // A helper method that performs the media thread part of initialization.
@@ skipping 20 matching lines @@
 
   // DemuxerAndroidClient implementation.
   void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;
   void OnDemuxerDataAvailable(const DemuxerData& params) override;
   void OnDemuxerSeekDone(base::TimeDelta actual_browser_seek_time) override;
   void OnDemuxerDurationChanged(base::TimeDelta duration) override;
 
  private:
   // The state machine states.
   enum PlayerState {
-    STATE_PAUSED,
-    STATE_WAITING_FOR_CONFIG,
-    STATE_PREFETCHING,
-    STATE_PLAYING,
-    STATE_STOPPING,
-    STATE_WAITING_FOR_SURFACE,
-    STATE_WAITING_FOR_SEEK,
-    STATE_ERROR,
+    kStatePaused,
+    kStateWaitingForConfig,
+    kStatePrefetching,
+    kStatePlaying,
+    kStateStopping,
+    kStateWaitingForSurface,
+    kStateWaitingForSeek,
+    kStateError,
+  };
+
+  enum StartStatus {
+    kStartOk = 0,
+    kStartBrowserSeekRequired,
+    kStartFailed,
   };
 
   // Cached values for the manager.
   struct MediaMetadata {
     base::TimeDelta duration;
     gfx::Size video_size;
   };
 
   // Information about current seek in progress.
   struct SeekInfo {
@@ skipping 21 matching lines @@
   void OnTimeIntervalUpdate(DemuxerStream::Type stream_type,
                             base::TimeDelta now_playing,
                             base::TimeDelta last_buffered);
 
   // Callbacks from video decoder
   void OnVideoCodecCreated();
   void OnVideoResolutionChanged(const gfx::Size& size);
 
   // Operations called from the state machine.
   void SetState(PlayerState new_state);
-  void SetPendingSurface(gfx::ScopedJavaSurface surface);
-  bool HasPendingSurface() const;
   void SetPendingStart(bool need_to_start);
   bool HasPendingStart() const;
   void SetPendingSeek(base::TimeDelta timestamp);
   base::TimeDelta GetPendingSeek() const;
   bool HasVideo() const;
   bool HasAudio() const;
   void SetDemuxerConfigs(const DemuxerConfigs& configs);
   void StartPrefetchDecoders();
-  void StartPlaybackDecoders();
+  void StartPlaybackOrBrowserSeek();
+  StartStatus StartPlaybackDecoders();
   void StopDecoders();
   void RequestToStopDecoders();
   void RequestDemuxerSeek(base::TimeDelta seek_time,
                           bool is_browser_seek = false);
   void ReleaseDecoderResources();
 
   // Helper methods.
   void CreateDecoders();
   bool AudioFinished() const;
   bool VideoFinished() const;
@@ skipping 12 matching lines @@
   scoped_ptr<MediaCodecVideoDecoder> video_decoder_;
 
   // The state of the state machine.
   PlayerState state_;
 
   // Notification callbacks, they call MediaPlayerManager.
   base::Closure request_resources_cb_;
   TimeUpdateCallback time_update_cb_;
   base::Closure completion_cb_;
   SeekDoneCallback seek_done_cb_;
+  ErrorCallback error_cb_;
 
   // A callback that updates metadata cache and calls the manager.
   MetadataChangedCallback metadata_changed_cb_;
 
   // We call the base class' AttachListener() and DetachListener() methods on UI
   // thread with these callbacks.
   base::Closure attach_listener_cb_;
   base::Closure detach_listener_cb_;
 
   // Error callback is posted by decoders or by this class itself if we cannot
   // configure or start decoder.
-  base::Closure error_cb_;
+  base::Closure internal_error_cb_;
 
   // Total duration reported by demuxer.
   base::TimeDelta duration_;
 
   // base::TickClock used by |interpolator_|.
   base::DefaultTickClock default_tick_clock_;
 
   // Tracks the most recent media time update and provides interpolated values
   // as playback progresses.
   TimeDeltaInterpolator interpolator_;
@@ skipping 15 matching lines @@
   base::WeakPtr<MediaCodecPlayer> media_weak_this_;
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaCodecPlayer> media_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_