MediaCodecPlayer - preroll and reconfiguration fixes

media/base/android/media_codec_decoder.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_DECODER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_DECODER_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 175 matching lines @@
 
   // Releases MediaCodecBridge and any related buffers or references.
   virtual void ReleaseMediaCodec();
 
   // Returns corresponding conditions.
   bool IsPrefetchingOrPlaying() const;
   bool IsStopped() const;
   bool IsCompleted() const;
   bool NotCompletedAndNeedsPreroll() const;
 
-  // Requests an A/V sync mechanism that is similar to preroll, but stops at the
-  // first available output frame rather than passing certain PTS.
-  void SetDecodingUntilOutputIsPresent();
+  // Sets preroll timestamp and requests preroll.
+  void SetPrerollTimestamp(base::TimeDelta preroll_ts);
 
   base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto();
 
   // Starts prefetching: accumulates enough data in AccessUnitQueue.
   // Decoder thread is not running.
   void Prefetch(const base::Closure& prefetch_done_cb);
 
   // Configures MediaCodec.
   ConfigStatus Configure();
 
   // Starts the decoder for prerolling. This method starts the decoder thread.
-  bool Preroll(base::TimeDelta preroll_timestamp,
-               const base::Closure& preroll_done_cb);
+  bool Preroll(const base::Closure& preroll_done_cb);
 
   // Starts the decoder after preroll is not needed, starting decoder thread
   // if it has not started yet.
   bool Start(base::TimeDelta start_timestamp);
 
   // Stops the playback process synchronously. This method stops the decoder
   // thread synchronously, and then releases all MediaCodec buffers.
   void SyncStop();
 
   // Requests to stop the playback and returns.
@@ skipping 119 matching lines @@
     kPrefetching,
     kPrefetched,
     kPrerolling,
     kPrerolled,
     kRunning,
     kStopping,
     kInEmergencyStop,
     kError,
   };
 
-  enum PrerollMode {
-    kNoPreroll = 0,
-    kPrerollTillOutputIsPresent,
-    kPrerollTillPTS,
-  };
-
   // Helper method that processes an error from MediaCodec.
   void OnCodecError();
 
   // Requests data. Ensures there is no more than one request at a time.
   void RequestData();
 
   // Prefetching callback that is posted to Media thread
   // in the kPrefetching state.
   void PrefetchNextChunk();
 
@@ skipping 46 matching lines @@
   // Callback for posting OnPrerollDone method.
   base::Closure internal_preroll_done_cb_;
 
   // Internal state.
   DecoderState state_;
   mutable base::Lock state_lock_;
 
   // Preroll timestamp is set if we need preroll and cleared after we done it.
   base::TimeDelta preroll_timestamp_;
 
-  // The preroll mode. If not |kNoPreroll|, the playback should start with
-  // preroll.
-  PrerollMode preroll_mode_;
+  // Set to true when MediaCodec internal buffers are filled up.
+  bool is_prepared_;
 
   // Flag is set when the EOS is enqueued into MediaCodec. Reset by Flush.
   bool eos_enqueued_;
 
   // Flag is set when the EOS is received in MediaCodec output. Reset by Flush.
   bool completed_;
 
   // Flag to ensure we post last frame notification once.
   bool last_frame_posted_;
 
@@ skipping 10 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaCodecDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_DECODER_H_