Let audio wait for video to finish prerolling after seek

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 72 matching lines @@
 
   // Playback is completed for one channel.
   void PlaybackCompleted(bool is_audio);
 
   // Called when the decoder finishes its task.
   void MediaDecoderCallback(
         bool is_audio, MediaCodecStatus status,
         base::TimeDelta current_presentation_timestamp,
         base::TimeDelta max_presentation_timestamp);
 
+  bool IsPrerollFinished(bool is_audio) const;
+
   // Gets MediaCrypto object from |drm_bridge_|.
   base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto();
 
   // Callback to notify that MediaCrypto is ready in |drm_bridge_|.
   void OnMediaCryptoReady();
 
   // Handle pending events if all the decoder jobs are not currently decoding.
   void ProcessPendingEvents();
 
   // Flush the decoders and clean up all the data needs to be decoded.
   void ClearDecodingData();
 
   // Called to decode more data.
   void DecodeMoreAudio();
   void DecodeMoreVideo();
 
   // Functions check whether audio/video is present.
-  bool HasVideo();
-  bool HasAudio();
+  bool HasVideo() const;
+  bool HasAudio() const;
 
   // Functions that check whether audio/video stream has reached end of output
   // or are not present in player configuration.
   bool AudioFinished();
   bool VideoFinished();
 
   // Determine seekability based on duration.
   bool Seekable();
 
   // Called when the |decoder_starvation_callback_| times out.
@@ skipping 129 matching lines @@
 
   // Indicates whether the player is waiting for audio or video decoder to be
   // created. This could happen if video surface is not available or key is
   // not added.
   bool is_waiting_for_audio_decoder_;
   bool is_waiting_for_video_decoder_;
 
   // Test-only callback for hooking the completion of the next decode cycle.
   base::Closure decode_callback_for_testing_;
 
+  // Whether audio or video decoder is in the process of prerolling.
+  bool prerolling_;
+
   // Weak pointer passed to media decoder jobs for callbacks.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
   base::WeakPtr<MediaSourcePlayer> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_