Move bulk of media::AudioRendererImpl::Render() logic to media thread.

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 15 matching lines @@
 #include "base/synchronization/lock.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
 #include "media/filters/audio_renderer_algorithm.h"
 #include "media/filters/decoder_stream.h"
 
 namespace base {
 class SingleThreadTaskRunner;
+class TickClock;
 }
 
 namespace media {
 
 class AudioBufferConverter;
 class AudioBus;
 class AudioClock;
 class AudioHardwareConfig;
 class AudioSplicer;
 class DecryptingDemuxerStream;
@@ skipping 27 matching lines @@
                           const base::Closure& ended_cb,
                           const PipelineStatusCB& error_cb) OVERRIDE;
   virtual void StartRendering() OVERRIDE;
   virtual void StopRendering() OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void SetPlaybackRate(float rate) OVERRIDE;
   virtual void StartPlayingFrom(base::TimeDelta timestamp) OVERRIDE;
   virtual void SetVolume(float volume) OVERRIDE;
 
-  // Allows injection of a custom time callback for non-realtime testing.
-  typedef base::Callback<base::TimeTicks()> NowCB;
-  void set_now_cb_for_testing(const NowCB& now_cb) {
-    now_cb_ = now_cb;
-  }
+  void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock);
 
  private:
   friend class AudioRendererImplTest;
 
   // Important detail: being in kPlaying doesn't imply that audio is being
   // rendered. Rather, it means that the renderer is ready to go. The actual
   // rendering of audio is controlled via Start/StopRendering().
   //
   //   kUninitialized
   //         | Initialize()
@@ skipping 48 matching lines @@
   //
   // Render() updates the pipeline's playback timestamp. If Render() is
   // not called at the same rate as audio samples are played, then the reported
   // timestamp in the pipeline will be ahead of the actual audio playback. In
   // this case |audio_delay_milliseconds| should be used to indicate when in the
   // future should the filled buffer be played.
   virtual int Render(AudioBus* audio_bus,
                      int audio_delay_milliseconds) OVERRIDE;
   virtual void OnRenderError() OVERRIDE;
 
+  // Contains result of the last call to Render(). Used to update |audio_clock_|
+  // and changes in buffering state.
+  struct RenderResult {
+    RenderResult();
+
+    base::TimeTicks ticks;
+    int requested_frames;
+    int delay_frames;
+    int frames_written;
+    float playback_rate;
+    base::TimeDelta endpoint_timestamp;
+  };
+  void DidRender(RenderResult result);
+
   // Helper methods that schedule an asynchronous read from the decoder as long
   // as there isn't a pending read.
   //
   // Must be called on |task_runner_|.
-  void AttemptRead();
   void AttemptRead_Locked();
-  bool CanRead_Locked();
   void ChangeState_Locked(State new_state);
 
   // Returns true if the data in the buffer is all before |start_timestamp_|.
   // This can only return true while in the kPlaying state.
   bool IsBeforeStartTime(const scoped_refptr<AudioBuffer>& buffer);
 
   // Called upon AudioBufferStream initialization, or failure thereof (indicated
   // by the value of |success|).
   void OnAudioBufferStreamInitialized(bool succes);
 
   // Used to initiate the flush operation once all pending reads have
   // completed.
   void DoFlush_Locked();
 
   // Calls |decoder_|.Reset() and arranges for ResetDecoderDone() to get
   // called when the reset completes.
   void ResetDecoder();
 
   // Called when the |decoder_|.Reset() has completed.
   void ResetDecoderDone();
 
   // Called by the AudioBufferStream when a splice buffer is demuxed.
   void OnNewSpliceBuffer(base::TimeDelta);
 
   // Called by the AudioBufferStream when a config change occurs.
   void OnConfigChange();
 
   // Updates |buffering_state_| and fires |buffering_state_cb_|.
-  void SetBufferingState_Locked(BufferingState buffering_state);
+  void SetBufferingState(BufferingState buffering_state);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   scoped_ptr<AudioSplicer> splicer_;
   scoped_ptr<AudioBufferConverter> buffer_converter_;
 
   // Whether or not we expect to handle config changes.
   bool expecting_config_changes_;
 
   // The sink (destination) for rendered audio. |sink_| must only be accessed
@@ skipping 12 matching lines @@
   // 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_;
 
-  // Typically calls base::TimeTicks::Now() but can be overridden by a test.
-  NowCB now_cb_;
+  scoped_ptr<base::TickClock> tick_clock_;
 
   // After Initialize() has completed, all variables below must be accessed
   // under |lock_|. ------------------------------------------------------------
   base::Lock lock_;
 
   // Algorithm for scaling audio.
   scoped_ptr<AudioRendererAlgorithm> algorithm_;
 
   // Simple state tracking variable.
   State state_;
@@ skipping 20 matching lines @@
 
   // 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_