Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / media / base / audio_renderer.h

diff --git a/src/media/base/audio_renderer.h b/src/media/base/audio_renderer.h
index 2d7d3e1..3e7131c 100644 (file)
--- a/src/media/base/audio_renderer.h
+++ b/src/media/base/audio_renderer.h
@@ -6,14 +6,15 @@
 #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"
 
 namespace media {
 
 class DemuxerStream;
+class TimeSource;
 
 class MEDIA_EXPORT AudioRenderer {
  public:
@@ -22,6 +23,8 @@ class MEDIA_EXPORT AudioRenderer {
   typedef base::Callback<void(base::TimeDelta, base::TimeDelta)> TimeCB;
 
   AudioRenderer();
+
+  // Stop all operations and fire all pending callbacks.
   virtual ~AudioRenderer();
 
   // Initialize an AudioRenderer with |stream|, executing |init_cb| upon
@@ -29,55 +32,39 @@ class MEDIA_EXPORT AudioRenderer {
   //
   // |statistics_cb| is executed periodically with audio rendering stats.
   //
-  // |underflow_cb| is executed when the renderer runs out of data to pass to
-  // the audio card during playback. ResumeAfterUnderflow() must be called
-  // to resume playback. Pause(), Preroll(), or Stop() cancels the underflow
-  // condition.
-  //
   // |time_cb| is executed whenever time has advanced by way of audio rendering.
   //
+  // |buffering_state_cb| is executed when audio rendering has either run out of
+  // data or has enough data to continue playback.
+  //
   // |ended_cb| is executed when audio rendering has reached the end of stream.
   //
   // |error_cb| is executed if an error was encountered.
   virtual void Initialize(DemuxerStream* stream,
                           const PipelineStatusCB& init_cb,
                           const StatisticsCB& statistics_cb,
-                          const base::Closure& underflow_cb,
                           const TimeCB& time_cb,
+                          const BufferingStateCB& buffering_state_cb,
                           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.
-  virtual void StartRendering() = 0;
-
-  // Signal audio playback to stop until further notice. It is expected that
-  // |time_cb| will no longer be run.
-  virtual void StopRendering() = 0;
+  // Returns the TimeSource associated with audio rendering.
+  virtual TimeSource* GetTimeSource() = 0;
 
   // Discard any audio data, executing |callback| when completed.
+  //
+  // Clients should expect |buffering_state_cb| to be called with
+  // BUFFERING_HAVE_NOTHING while flushing is in progress.
   virtual void Flush(const base::Closure& callback) = 0;
 
-  // Start prerolling audio data for samples starting at |time|, executing
-  // |callback| when completed.
+  // Starts playback by reading from |stream| and decoding and rendering audio.
   //
   // Only valid to call after a successful Initialize() or Flush().
-  virtual void Preroll(base::TimeDelta time,
-                       const PipelineStatusCB& callback) = 0;
-
-  // Stop all operations in preparation for being deleted, executing |callback|
-  // when complete.
-  virtual void Stop(const base::Closure& callback) = 0;
-
-  // Updates the current playback rate.
-  virtual void SetPlaybackRate(float playback_rate) = 0;
+  virtual void StartPlaying() = 0;
 
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;
 
-  // Resumes playback after underflow occurs.
-  virtual void ResumeAfterUnderflow() = 0;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioRenderer);
 };