MediaCodecPlayer implementation (stage 4 - preroll)

media/base/android/media_codec_player.cc

Index: media/base/android/media_codec_player.cc
diff --git a/media/base/android/media_codec_player.cc b/media/base/android/media_codec_player.cc
index b75569f2a3f69d598f0a802714394efbcd34e0e5..67bd85886ca33dbe63817ef7bc8ba264511c7df5 100644
--- a/media/base/android/media_codec_player.cc
+++ b/media/base/android/media_codec_player.cc
@@ -421,6 +421,8 @@ void MediaCodecPlayer::OnDemuxerSeekDone(
 
   interpolator_.SetBounds(seek_time, seek_time);
   audio_decoder_->SetBaseTimestamp(seek_time);
+  audio_decoder_->SetPrerollTimestamp(seek_time);
+  video_decoder_->SetPrerollTimestamp(seek_time);
 
   base::TimeDelta pending_seek_time = GetPendingSeek();
   if (pending_seek_time != kNoTimestamp()) {
@@ -530,12 +532,31 @@ void MediaCodecPlayer::OnPrefetchDone() {
   StartPlaybackOrBrowserSeek();
 }
 
+void MediaCodecPlayer::OnPrerollDone() {
+  DCHECK(GetMediaTaskRunner()->BelongsToCurrentThread());
+  DVLOG(1) << __FUNCTION__;
+
+  if (!(audio_decoder_->IsPrerollDone() && video_decoder_->IsPrerollDone())) {
+    DVLOG(1) << __FUNCTION__ << " both audio and video needs to be done"
+             << " prerolling, ignoring";
+    return;  // Wait until both streams are done prerolling.
+  }
+
+  if (!AudioFinished())
+    audio_decoder_->ResumeAfterPreroll();
+  if (!VideoFinished())
+    video_decoder_->ResumeAfterPreroll();
+}
+
 void MediaCodecPlayer::OnStopDone() {
   DCHECK(GetMediaTaskRunner()->BelongsToCurrentThread());
   DVLOG(1) << __FUNCTION__;
 
-  if (!(audio_decoder_->IsStopped() && video_decoder_->IsStopped()))
+  if (!(audio_decoder_->IsStopped() && video_decoder_->IsStopped())) {
+    DVLOG(1) << __FUNCTION__ << " both audio and video has to be stopped"
+             << ", ignoring";
     return;  // Wait until other stream is stopped
+  }
 
   // At this point decoder threads should not be running
   if (interpolator_.interpolating())
@@ -897,6 +918,7 @@ void MediaCodecPlayer::CreateDecoders() {
                                        media_weak_this_, DemuxerStream::AUDIO),
       base::Bind(&MediaCodecPlayer::OnStarvation, media_weak_this_,
                  DemuxerStream::AUDIO),
+      base::Bind(&MediaCodecPlayer::OnPrerollDone, media_weak_this_),
       base::Bind(&MediaCodecPlayer::OnStopDone, media_weak_this_),
       internal_error_cb_,
       base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate, media_weak_this_,
@@ -907,6 +929,7 @@ void MediaCodecPlayer::CreateDecoders() {
                                        media_weak_this_, DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnStarvation, media_weak_this_,
                  DemuxerStream::VIDEO),
+      base::Bind(&MediaCodecPlayer::OnPrerollDone, media_weak_this_),
       base::Bind(&MediaCodecPlayer::OnStopDone, media_weak_this_),
       internal_error_cb_,
       base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate, media_weak_this_,