Make media::AudioRenderer inherit from media::TimeSource.

media/base/audio_renderer.h

Index: media/base/audio_renderer.h
diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h
index 00a8e7f14ddd84b0163d93d03e9c3a6b63bc40c8..a284f36823cbdf317d3fc16cb505c203051312c8 100644
--- a/media/base/audio_renderer.h
+++ b/media/base/audio_renderer.h
@@ -6,17 +6,16 @@
 #define MEDIA_BASE_AUDIO_RENDERER_H_
 
 #include "base/callback.h"
-#include "base/memory/ref_counted.h"
-#include "base/time/time.h"
 #include "media/base/buffering_state.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
+#include "media/base/time_source.h"
 
 namespace media {
 
 class DemuxerStream;
 
-class MEDIA_EXPORT AudioRenderer {
+class MEDIA_EXPORT AudioRenderer : public TimeSource {

[scherkus (not reviewing), 2014/07/21 17:07:53]

alternatively, we can have this interface have a getter so that we don't force
inheritance

I feel this also might make for an easier transition to Renderer

virtual TimeSource* GetTimeSource() = 0;

[xhwang, 2014/07/21 22:10:06]

The Renderer will do pretty much the same as the AudioRenderer does here: either
inherit TimeSource or provide a getter. In that sense, using a getter does seem
simpler. On the desktop case, you can just do something like 

TimeSource* Renderer::GetTimeSource() {
  if (audio_renderer_)
    return audio_renderer_->GetTimeSource();
  ...
}

  public:
   // First parameter is the current time that has been rendered.
   // Second parameter is the maximum time value that the clock cannot exceed.
@@ -46,24 +45,6 @@ class MEDIA_EXPORT AudioRenderer {
                           const base::Closure& ended_cb,
                           const PipelineStatusCB& error_cb) = 0;
 
-  // Signal audio playback to start at the current rate. It is expected that
-  // |time_cb| will eventually start being run with time updates.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void StartRendering() = 0;
-
-  // Signal audio playback to stop until further notice. It is expected that
-  // |time_cb| will no longer be run.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void StopRendering() = 0;
-
-  // Sets the media time to start rendering from. Only valid to call while not
-  // currently rendering.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void SetMediaTime(base::TimeDelta time) = 0;
-
   // Discard any audio data, executing |callback| when completed.
   //
   // Clients should expect |buffering_state_cb| to be called with
@@ -79,11 +60,6 @@ class MEDIA_EXPORT AudioRenderer {
   // when complete.
   virtual void Stop(const base::Closure& callback) = 0;
 
-  // Updates the current playback rate.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void SetPlaybackRate(float playback_rate) = 0;
-
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;