Revert of Switch to using media::TimeSource inside media::RendererImpl.

media/filters/audio_renderer_impl.h

 // Copyright (c) 2012 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.
 
 // Audio rendering unit utilizing an AudioRendererSink to output data.
 //
 // This class lives inside three threads during it's lifetime, namely:
 // 1. Render thread
 //    Where the object is created.
 // 2. Media thread (provided via constructor)
@@ skipping 57 matching lines @@
       const AudioHardwareConfig& hardware_params,
       const scoped_refptr<MediaLog>& media_log);
   virtual ~AudioRendererImpl();
 
   // TimeSource implementation.
   virtual void StartTicking() OVERRIDE;
   virtual void StopTicking() OVERRIDE;
   virtual void SetPlaybackRate(float rate) OVERRIDE;
   virtual void SetMediaTime(base::TimeDelta time) OVERRIDE;
   virtual base::TimeDelta CurrentMediaTime() OVERRIDE;
-  virtual base::TimeDelta CurrentMediaTimeForSyncingVideo() OVERRIDE;
 
   // AudioRenderer implementation.
   virtual void Initialize(DemuxerStream* stream,
                           const PipelineStatusCB& init_cb,
                           const StatisticsCB& statistics_cb,
+                          const TimeCB& time_cb,
                           const BufferingStateCB& buffering_state_cb,
                           const base::Closure& ended_cb,
                           const PipelineStatusCB& error_cb) OVERRIDE;
   virtual TimeSource* GetTimeSource() OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void StartPlaying() OVERRIDE;
   virtual void SetVolume(float volume) OVERRIDE;
 
  private:
   friend class AudioRendererImplTest;
@@ skipping 114 matching lines @@
   scoped_ptr<AudioBufferStream> audio_buffer_stream_;
 
   // Interface to the hardware audio params.
   const AudioHardwareConfig& hardware_config_;
 
   // Cached copy of hardware params from |hardware_config_|.
   AudioParameters audio_parameters_;
 
   // Callbacks provided during Initialize().
   PipelineStatusCB init_cb_;
+  TimeCB time_cb_;
   BufferingStateCB buffering_state_cb_;
   base::Closure ended_cb_;
   PipelineStatusCB error_cb_;
 
   // Callback provided to Flush().
   base::Closure flush_cb_;
 
   // After Initialize() has completed, all variables below must be accessed
   // under |lock_|. ------------------------------------------------------------
   base::Lock lock_;
@@ skipping 14 matching lines @@
 
   // Keep track of our outstanding read to |decoder_|.
   bool pending_read_;
 
   // Keeps track of whether we received and rendered the end of stream buffer.
   bool received_end_of_stream_;
   bool rendered_end_of_stream_;
 
   scoped_ptr<AudioClock> audio_clock_;
 
-  // The media timestamp to begin playback at after seeking. Set via
-  // SetMediaTime().
   base::TimeDelta start_timestamp_;
-
-  // The media timestamp to signal end of audio playback. Determined during
-  // Render() when writing the final frames of decoded audio data.
   base::TimeDelta ended_timestamp_;
-
-  // Set every Render() and used to provide an interpolated time value to
-  // CurrentMediaTimeForSyncingVideo().
-  base::TimeTicks last_render_ticks_;
+  base::TimeDelta last_timestamp_update_;
 
   // End variables which must be accessed under |lock_|. ----------------------
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<AudioRendererImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_