Revert of Fix an issue that audio and video may run 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 77fe1af3b4aa19c7364c65012df32ab1a29dc502..77caa9feec7f059b52c0fe8896dfc7bc63b66a08 100644
--- a/media/base/android/media_decoder_job.h
+++ b/media/base/android/media_decoder_job.h
@@ -29,16 +29,15 @@
   };
 
   // Callback when a decoder job finishes its work. Args: whether decode
-  // 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
+  // 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
   // update its clock to avoid introducing extra delays to the next frame.
   typedef base::Callback<void(MediaCodecStatus, base::TimeDelta,
-                              base::TimeDelta)> DecoderCallback;
+                              size_t)> DecoderCallback;
   // Callback when a decoder job finishes releasing the output buffer.
-  // Args: current presentation time, max presentation time.
-  typedef base::Callback<void(base::TimeDelta, base::TimeDelta)>
-      ReleaseOutputCompletionCallback;
+  // Args: audio output bytes, must be 0 for video.
+  typedef base::Callback<void(size_t)> ReleaseOutputCompletionCallback;
 
   virtual ~MediaDecoderJob();
 
@@ -96,7 +95,6 @@
       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
@@ -139,8 +137,8 @@
   // 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 current_presentation_timestamp,
-                         base::TimeDelta max_presentation_timestamp);
+                         base::TimeDelta presentation_timestamp,
+                         size_t audio_output_bytes);
 
   // Helper function to get the current access unit that is being decoded.
   const AccessUnit& CurrentAccessUnit() const;