Fix an issue that audio and video may ran out of sync

media/base/android/media_decoder_job.h

Index: media/base/android/media_decoder_job.h
diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h
index 77caa9feec7f059b52c0fe8896dfc7bc63b66a08..77fe1af3b4aa19c7364c65012df32ab1a29dc502 100644
--- a/media/base/android/media_decoder_job.h
+++ b/media/base/android/media_decoder_job.h
@@ -29,15 +29,16 @@ class MediaDecoderJob {
   };
 
   // Callback when a decoder job finishes its work. Args: whether decode
-  // finished successfully, presentation time, audio output bytes.
-  // If the presentation time is equal to kNoTimestamp(), the decoder job
-  // skipped rendering of the decoded output and the callback target should
+  // finished successfully, current presentation time, max presentation time.
+  // If the current presentation time is equal to kNoTimestamp(), the decoder
+  // job skipped rendering of the decoded output and the callback target should

[wolenetz, 2014/04/17 21:35:28]

This comment seems out-of-line with current MSP::MediaDecoderCallback
interpretation of current_presentation_time and kNoTimestamp(), or maybe it is
just confusing me. Please clarify whether or not MSP does (or should do) any
clock update if current_presentation_time is kNoTimestamp(). Also, does this
comment apply similarly to ReleaseOutputCompletionCB?

[qinmin, 2014/04/17 23:03:35]

Updated the comments.
MSP should ignore the timestsamps if kNoTimestamp is returned.
For example, if MSP's current_time is 10ms, and max_time is 30 ms, then MSP
should know that there are 20 ms seconds of audio in the audio track. If a
kNoTimestamp is returned at that moment, then MSP's internal clock should still
progress since the AudioTrack is still rendering. So MSP can just ignore the
callback.

On 2014/04/17 21:35:28, wolenetz wrote:

   // update its clock to avoid introducing extra delays to the next frame.
   typedef base::Callback<void(MediaCodecStatus, base::TimeDelta,
-                              size_t)> DecoderCallback;
+                              base::TimeDelta)> DecoderCallback;
   // Callback when a decoder job finishes releasing the output buffer.
-  // Args: audio output bytes, must be 0 for video.
-  typedef base::Callback<void(size_t)> ReleaseOutputCompletionCallback;
+  // Args: current presentation time, max presentation time.
+  typedef base::Callback<void(base::TimeDelta, base::TimeDelta)>
+      ReleaseOutputCompletionCallback;
 
   virtual ~MediaDecoderJob();
 
@@ -95,6 +96,7 @@ class MediaDecoderJob {
       int output_buffer_index,
       size_t size,
       bool render_output,
+      base::TimeDelta current_presentation_timestamp,
       const ReleaseOutputCompletionCallback& callback) = 0;
 
   // Returns true if the "time to render" needs to be computed for frames in
@@ -137,8 +139,8 @@ class MediaDecoderJob {
   // Completes any pending job destruction or any pending decode stop. If
   // destruction was not pending, passes its arguments to |decode_cb_|.
   void OnDecodeCompleted(MediaCodecStatus status,
-                         base::TimeDelta presentation_timestamp,
-                         size_t audio_output_bytes);
+                         base::TimeDelta current_presentation_timestamp,
+                         base::TimeDelta max_presentation_timestamp);
 
   // Helper function to get the current access unit that is being decoded.
   const AccessUnit& CurrentAccessUnit() const;