MediaCodecPlayer implementation (stage 4 - preroll)

media/base/android/media_codec_video_decoder.cc

 // 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.
 
 #include "media/base/android/media_codec_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/buffers.h"
 #include "media/base/demuxer_stream.h"
 
 namespace media {
 
 namespace {
 const int kDelayForStandAloneEOS = 2;  // milliseconds
 }
 
 MediaCodecVideoDecoder::MediaCodecVideoDecoder(
     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,
     const VideoSizeChangedCallback& video_size_changed_cb,
     const base::Closure& codec_created_cb)
     : MediaCodecDecoder(media_task_runner,
                         request_data_cb,
                         starvation_cb,
+                        preroll_done_cb,
                         stop_done_cb,
                         error_cb,
                         "VideoDecoder"),
       update_current_time_cb_(update_current_time_cb),
       video_size_changed_cb_(video_size_changed_cb),
       codec_created_cb_(codec_created_cb) {
 }
 
 MediaCodecVideoDecoder::~MediaCodecVideoDecoder() {
   DVLOG(1) << "VideoDecoder::~VideoDecoder()";
@@ skipping 111 matching lines @@
     return CONFIG_FAILURE;
   }
 
   DVLOG(1) << class_name() << "::" << __FUNCTION__ << " succeeded";
 
   media_task_runner_->PostTask(FROM_HERE, codec_created_cb_);
 
   return CONFIG_OK;
 }
 
-void MediaCodecVideoDecoder::SynchronizePTSWithTime(
-    base::TimeDelta current_time) {
+void MediaCodecVideoDecoder::AssociateCurrentTimeWithPTS(base::TimeDelta pts) {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
   start_time_ticks_ = base::TimeTicks::Now();
-  start_pts_ = current_time;
-  last_seen_pts_ = current_time;
+  start_pts_ = pts;
+  last_seen_pts_ = pts;
+}
+
+void MediaCodecVideoDecoder::DissociatePTSFromTime() {
+  DCHECK(media_task_runner_->BelongsToCurrentThread());
+
+  start_pts_ = last_seen_pts_ = kNoTimestamp();
 }
 
 void MediaCodecVideoDecoder::OnOutputFormatChanged() {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
   gfx::Size prev_size = video_size_;
 
   // See b/18224769. The values reported from MediaCodecBridge::GetOutputFormat
   // correspond to the actual video frame size, but this is not necessarily the
   // size that should be output.
@@ skipping 20 matching lines @@
   if (!size && eos_encountered) {
     // Stand-alone EOS
     // Discard the PTS that comes with it and ensure it is released last.
     pts = last_seen_pts_ +
           base::TimeDelta::FromMilliseconds(kDelayForStandAloneEOS);
   } else {
     // Keep track of last seen PTS
     last_seen_pts_ = pts;
   }
 
-  if (!render_output) {
+  if (!render_output || start_pts_ == kNoTimestamp()) {
     ReleaseOutputBuffer(buffer_index, pts, size, false, eos_encountered);
     return;
   }
 
   base::TimeDelta time_to_render =
       pts - (base::TimeTicks::Now() - start_time_ticks_ + start_pts_);
 
   if (time_to_render < base::TimeDelta()) {
     // Skip late frames
     ReleaseOutputBuffer(buffer_index, pts, size, false, eos_encountered);
@@ skipping 54 matching lines @@
 
   // |update_current_time_cb_| might be null if there is audio stream.
   // Do not update current time for stand-alone EOS frames.
   if (!update_current_time_cb_.is_null() && !(eos_encountered && !size)) {
     media_task_runner_->PostTask(FROM_HERE,
                                  base::Bind(update_current_time_cb_, pts, pts));
   }
 }
 
 }  // namespace media