MediaCodecPlayer implementation (stage 4 - preroll)

media/base/android/media_codec_audio_decoder.cc

Index: media/base/android/media_codec_audio_decoder.cc
diff --git a/media/base/android/media_codec_audio_decoder.cc b/media/base/android/media_codec_audio_decoder.cc
index 373d062ac56d5fab2963b4ad1402c1ec0ad20fec..d938db9885f618cb06accd316b353a4e32be7986 100644
--- a/media/base/android/media_codec_audio_decoder.cc
+++ b/media/base/android/media_codec_audio_decoder.cc
@@ -15,6 +15,9 @@ namespace {
 // Use 16bit PCM for audio output. Keep this value in sync with the output
 // format we passed to AudioTrack in MediaCodecBridge.
 const int kBytesPerAudioOutputSample = 2;
+
+// Fake buffer index that refers to pending buffer.
+const int kPendingBufferIndex = -1;
 }
 
 namespace media {
@@ -71,6 +74,11 @@ void MediaCodecAudioDecoder::Flush() {
   frame_count_ = 0;
 }
 
+void MediaCodecAudioDecoder::ReleaseMediaCodec() {
+  DCHECK(media_task_runner_->BelongsToCurrentThread());
+  MediaCodecDecoder::ReleaseMediaCodec();
+}
+
 void MediaCodecAudioDecoder::SetVolume(double volume) {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
@@ -159,37 +167,55 @@ void MediaCodecAudioDecoder::OnOutputFormatChanged() {
 
 void MediaCodecAudioDecoder::Render(int buffer_index,
                                     size_t size,
-                                    bool render_output,
+                                    RenderMode render_mode,
                                     base::TimeDelta pts,
                                     bool eos_encountered) {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
-  DVLOG(2) << class_name() << "::" << __FUNCTION__ << " pts:" << pts;
+  DVLOG(2) << class_name() << "::" << __FUNCTION__ << " pts:" << pts << " "
+           << AsString(render_mode);
+
+  const bool do_play = (render_mode != kRenderSkip);
+
+  if (do_play) {
+    AudioCodecBridge* audio_codec =
+        static_cast<AudioCodecBridge*>(media_codec_bridge_.get());
 
-  render_output = render_output && (size != 0u);
+    DCHECK(audio_codec);
+
+    const bool postpone = (render_mode == kRenderAfterPreroll);
 
-  if (render_output) {
     int64 head_position =
-        (static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))
-            ->PlayOutputBuffer(buffer_index, size);
+        audio_codec->PlayOutputBuffer(buffer_index, size, postpone);
+
+    DVLOG(2) << class_name() << "::" << __FUNCTION__ << " pts:" << pts
+             << (postpone ? " POSTPONE" : "")
+             << " head_position:" << head_position;
 
     size_t new_frames_count = size / bytes_per_frame_;
     frame_count_ += new_frames_count;
     audio_timestamp_helper_->AddFrames(new_frames_count);
-    int64 frames_to_play = frame_count_ - head_position;
-    DCHECK_GE(frames_to_play, 0);
 
-    base::TimeDelta last_buffered = audio_timestamp_helper_->GetTimestamp();
-    base::TimeDelta now_playing =
-        last_buffered -
-        audio_timestamp_helper_->GetFrameDuration(frames_to_play);
+    if (!postpone) {
+      int64 frames_to_play = frame_count_ - head_position;
 
-    DVLOG(2) << class_name() << "::" << __FUNCTION__ << " pts:" << pts
-             << " will play: [" << now_playing << "," << last_buffered << "]";
+      DCHECK_GE(frames_to_play, 0) << class_name() << "::" << __FUNCTION__
+                                   << " pts:" << pts
+                                   << " frame_count_:" << frame_count_
+                                   << " head_position:" << head_position;
+
+      base::TimeDelta last_buffered = audio_timestamp_helper_->GetTimestamp();
+      base::TimeDelta now_playing =
+          last_buffered -
+          audio_timestamp_helper_->GetFrameDuration(frames_to_play);
+
+      DVLOG(2) << class_name() << "::" << __FUNCTION__ << " pts:" << pts
+               << " will play: [" << now_playing << "," << last_buffered << "]";
 
-    media_task_runner_->PostTask(
-        FROM_HERE,
-        base::Bind(update_current_time_cb_, now_playing, last_buffered));
+      media_task_runner_->PostTask(
+          FROM_HERE,
+          base::Bind(update_current_time_cb_, now_playing, last_buffered));
+    }
   }
 
   media_codec_bridge_->ReleaseOutputBuffer(buffer_index, false);