Android: Propagate sample rate change to audio decoder job

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 9bc293dd2f8f614eee99d1032482b490dffa9144..7df35c3d717b1964f582edce19156a0064c59cb9 100644
--- a/media/base/android/audio_decoder_job.h
+++ b/media/base/android/audio_decoder_job.h
@@ -29,6 +29,7 @@ class AudioDecoderJob : public MediaDecoderJob {
 
   // MediaDecoderJob implementation.
   virtual bool HasStream() const override;
+  virtual void Flush() override;
   virtual void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
 
   // Sets the volume of the audio output.
@@ -49,20 +50,26 @@ class AudioDecoderJob : public MediaDecoderJob {
   virtual bool AreDemuxerConfigsChanged(
       const DemuxerConfigs& configs) const override;
   virtual bool CreateMediaCodecBridgeInternal() override;
+  virtual void GotOutputFormatChanged() override;
 
   // Helper method to set the audio output volume.
   void SetVolumeInternal();
 
+  void ResetTimestampHelper();
+
   // Audio configs from the demuxer.
   AudioCodec audio_codec_;
   int num_channels_;
-  int sampling_rate_;
+  int config_sampling_rate_;
   std::vector<uint8> audio_extra_data_;
   double volume_;
   int bytes_per_frame_;
 
-  // Base timestamp for the |audio_timestamp_helper_|.
-  base::TimeDelta base_timestamp_;
+  // Audio output sample rate
+  int output_sampling_rate_;
+
+  // Frame count to sync with audio codec output
+  int64 frame_count_;
 
   // Object to calculate the current audio timestamp for A/V sync.
   scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_;