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 c910ce62f272ef889354ea257d6adc9462b935f3..1633e6b7dcd0f0d8377bf4b08108140dbb76ccb4 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 {
@@ -23,12 +26,14 @@ MediaCodecAudioDecoder::MediaCodecAudioDecoder(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
     const base::Closure& request_data_cb,
     const base::Closure& starvation_cb,
+    const base::Closure& preroll_done_cb,
     const base::Closure& stop_done_cb,
     const base::Closure& error_cb,
     const SetTimeCallback& update_current_time_cb)
     : MediaCodecDecoder(media_task_runner,
                         request_data_cb,
                         starvation_cb,
+                        preroll_done_cb,
                         stop_done_cb,
                         error_cb,
                         "AudioDecoder"),
@@ -36,6 +41,9 @@ MediaCodecAudioDecoder::MediaCodecAudioDecoder(
       bytes_per_frame_(0),
       output_sampling_rate_(0),
       frame_count_(0),
+#ifndef NDEBUG
+      num_postponed_buffers_(0),
+#endif
       update_current_time_cb_(update_current_time_cb) {
 }
 
@@ -69,6 +77,21 @@ void MediaCodecAudioDecoder::Flush() {
 
   MediaCodecDecoder::Flush();
   frame_count_ = 0;
+
+#ifndef NDEBUG
+  // Maintain the number of postponed buffers corresponding to the Java side.
+  num_postponed_buffers_ = 0;
+#endif
+}
+
+void MediaCodecAudioDecoder::ReleaseMediaCodec() {
+  DCHECK(media_task_runner_->BelongsToCurrentThread());
+  MediaCodecDecoder::ReleaseMediaCodec();
+
+#ifndef NDEBUG
+  // Maintain the number of postponed buffers corresponding to the Java side.
+  num_postponed_buffers_ = 0;
+#endif
 }
 
 void MediaCodecAudioDecoder::SetVolume(double volume) {
@@ -158,37 +181,72 @@ 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);
+
+#ifndef NDEBUG
+    // MediaCodecBrdge.java only keeps one buffer postponed buffer, but we

[qinmin, 2015/08/03 21:25:15]

I don't think this is true with you CL "keeps one buffer postponed buffer"

[Tima Vaisburd, 2015/08/03 22:49:05]

I kept only one buffer on Java side instead of an array of buffers, put assert
there and removed DCHECKs here on C++ side.

+    // increase |frame_count_| every time we call PlayOutputBuffer().
+    // Check that we are in balance with MediaCodecBrdge.java.
+    // TODO(timav): It seems better to let Java side keep an array of
+    // postponed buffers and drop this check.
+    if (postpone)
+      ++num_postponed_buffers_;
+    else
+      num_postponed_buffers_ = 0;
+    DCHECK_GE(1, num_postponed_buffers_);
+#endif
 
-  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);
-
-    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));
+    if (!postpone) {
+      int64 frames_to_play = frame_count_ - head_position;
+
+      // TODO(timav): remove this DVLOG after more testing.
+      if (frames_to_play < 0) {
+        DVLOG(0) << class_name() << "::" << __FUNCTION__ << " pts:" << pts
+                 << " frame_count_ < head_position (" << frame_count_ << " < "
+                 << head_position << ")"
+                 << " new_frames_count:" << new_frames_count;
+      }
+      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);
+
+      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_codec_bridge_->ReleaseOutputBuffer(buffer_index, false);