Enable seek in fullscreen mode for MSE impl on android

media/base/android/media_source_player.h

 // Copyright (c) 2013 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_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 113 matching lines @@
   virtual void SetVolume(float leftVolume, float rightVolume) OVERRIDE;
   virtual int GetVideoWidth() OVERRIDE;
   virtual int GetVideoHeight() OVERRIDE;
   virtual base::TimeDelta GetCurrentTime() OVERRIDE;
   virtual base::TimeDelta GetDuration() OVERRIDE;
   virtual bool IsPlaying() OVERRIDE;
   virtual bool CanPause() OVERRIDE;
   virtual bool CanSeekForward() OVERRIDE;
   virtual bool CanSeekBackward() OVERRIDE;
   virtual bool IsPlayerReady() OVERRIDE;
+  virtual void OnSeekRequestAck() OVERRIDE;
 
   // Called when the demuxer is ready.
   virtual void DemuxerReady(
       const MediaPlayerHostMsg_DemuxerReady_Params& params) OVERRIDE;
 
   // Called when the requested data is received from the demuxer.
   virtual void ReadFromDemuxerAck(
       const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) OVERRIDE;
 
  private:
-  // Update the timestamps for A/V sync scheduling. |kickoff_time| keeps
-  // track of when the job is started. We need this to check if a seek is
-  // performed during decoding.
+  // Update the timestamps for A/V sync scheduling.
   void UpdateTimestamps(
-      const base::Time& kickoff_time,
       const base::TimeDelta& presentation_timestamp,
       const base::Time& wallclock_time);
 
   // Helper function for starting media playback.
   void StartInternal();
 
   // Playback is completed for one channel.
   void PlaybackCompleted(bool is_audio);
 
   // Called when the decoder finishes its task.
   void MediaDecoderCallback(
-        bool is_audio, const base::Time& kickoff_time,
-        const base::TimeDelta& presentation_timestamp,
+        bool is_audio, const base::TimeDelta& presentation_timestamp,
         const base::Time& wallclock_time, bool end_of_stream);
 
+  // Handle pending events when all the decoder jobs finished.
+  void ProcessPendingEvents();
+
+  // Flush the decoders and clean up all the data needs to be decoded.
+  void ClearDecodingData();
+
   // Called to decoder more data.
   void DecodeMoreAudio();
   void DecodeMoreVideo();
 
   // Functions check whether audio/video is present.
   bool HasVideo();
   bool HasAudio();
 
-  // Pending play event while player is preparing.
-  bool pending_play_;
+  enum PendingEventFlags {
+    NO_EVENT_PENDING = 0,
+    SEEK_EVENT_PENDING = 1 << 0,
+    SURFACE_CHANGE_EVENT_PENDING = 1 << 1,
+  };
+  // Pending event that the player needs to do.
+  unsigned pending_event_;
+
+  // Number of active decoding tasks.
+  int active_decoding_tasks_;
 
   // Stats about the media.
   base::TimeDelta duration_;
   int width_;
   int height_;
   AudioCodec audio_codec_;
   VideoCodec video_codec_;
   int num_channels_;
   int sampling_rate_;
   bool seekable_;
   base::TimeDelta last_presentation_timestamp_;
   std::vector<uint8> audio_extra_data_;
   bool audio_finished_;
   bool video_finished_;
   bool playing_;
 
   // Timestamps for providing simple A/V sync. When start decoding an audio
   // chunk, we record its presentation timestamp and the current system time.
   // Then we use this information to estimate when the next audio/video frame
   // should be rendered.
   // TODO(qinmin): Need to fix the problem if audio/video lagged too far behind
   // due to network or decoding problem.
   base::Time start_wallclock_time_;
   base::TimeDelta start_presentation_timestamp_;
-  base::Time last_seek_time_;
 
   // Decoder jobs
   ScopedMediaDecoderJob audio_decoder_job_;
   ScopedMediaDecoderJob video_decoder_job_;
 
   // These variables keep track of the current decoding data.
   // TODO(qinmin): remove these variables when we no longer relies on IPC for
   // data passing.
   size_t audio_access_unit_index_;
   size_t video_access_unit_index_;
   bool waiting_for_audio_data_;
   bool waiting_for_video_data_;
   MediaPlayerHostMsg_ReadFromDemuxerAck_Params received_audio_;
   MediaPlayerHostMsg_ReadFromDemuxerAck_Params received_video_;
 
+  // Whether the video decoder need to use anempty surface.
+  bool use_empty_surface_;
+
   // Weak pointer passed to media decoder jobs for callbacks.
   base::WeakPtrFactory<MediaSourcePlayer> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_