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

media/base/android/audio_decoder_job.h

Index: media/base/android/audio_decoder_job.h
diff --git a/media/base/android/audio_decoder_job.h b/media/base/android/audio_decoder_job.h
index 3d1b21f4b4a44298b2fd790f39c3f3848ac27a27..4a37038c430cd5055a34c94bd89ec4953413d06f 100644
--- a/media/base/android/audio_decoder_job.h
+++ b/media/base/android/audio_decoder_job.h
@@ -12,6 +12,7 @@
 namespace media {
 
 class AudioCodecBridge;
+class AudioTimestampHelper;
 
 // Class for managing audio decoding jobs.
 class AudioDecoderJob : public MediaDecoderJob {
@@ -34,8 +35,13 @@ class AudioDecoderJob : public MediaDecoderJob {
 
   void SetVolume(double volume);
 
+  // Sets the base timestamp for |audio_timestamp_helper_|.
+  void SetBaseTimestamp(base::TimeDelta base_timestamp);
+
  private:
-  AudioDecoderJob(scoped_ptr<AudioCodecBridge> audio_decoder_bridge,
+  AudioDecoderJob(scoped_ptr<AudioTimestampHelper> audio_timestamp_helper,
+                  scoped_ptr<AudioCodecBridge> audio_decoder_bridge,
+                  int bytes_per_frame,
                   const base::Closure& request_data_cb);
 
   // MediaDecoderJob implementation.
@@ -43,11 +49,18 @@ class AudioDecoderJob : public MediaDecoderJob {
       int output_buffer_index,
       size_t size,
       bool render_output,
+      base::TimeDelta current_presentation_timestamp,
       const ReleaseOutputCompletionCallback& callback) OVERRIDE;
 
   virtual bool ComputeTimeToRender() const OVERRIDE;
 
+  // number of bytes per audio frame;
+  int bytes_per_frame_;
+
   scoped_ptr<AudioCodecBridge> audio_codec_bridge_;
+
+  // Object to calculate the current audio timestamp for A/V sync.
+  scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_;
 };
 
 }  // namespace media