Move Renderer permanent callbacks into RendererClient interface.

media/renderers/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 61 matching lines @@
   void StartTicking() override;
   void StopTicking() override;
   void SetPlaybackRate(double rate) override;
   void SetMediaTime(base::TimeDelta time) override;
   base::TimeDelta CurrentMediaTime() override;
   bool GetWallClockTimes(
       const std::vector<base::TimeDelta>& media_timestamps,
       std::vector<base::TimeTicks>* wall_clock_times) override;
 
   // AudioRenderer implementation.
-  void Initialize(DemuxerStream* stream,
-                  const PipelineStatusCB& init_cb,
+  void Initialize(RendererClient* client,
+                  DemuxerStream* stream,
                   CdmContext* cdm_context,
-                  const StatisticsCB& statistics_cb,
-                  const BufferingStateCB& buffering_state_cb,
-                  const base::Closure& ended_cb,
-                  const PipelineStatusCB& error_cb,
-                  const base::Closure& waiting_for_decryption_key_cb) override;
+                  const PipelineStatusCB& init_cb) override;
   TimeSource* GetTimeSource() override;
   void Flush(const base::Closure& callback) override;
   void StartPlaying() override;
   void SetVolume(float volume) override;
 
  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
@@ skipping 67 matching lines @@
   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);

[xhwang, 2016/05/09 18:13:23]

Add an empty line here since the comment above only applies to this one method.

[alokp, 2016/05/09 21:31:44]

Done.

+  void OnPlaybackError(PipelineStatus error);

[xhwang, 2016/05/09 18:13:22]

Add comment for this group, e.g. callbacks for the |client| etc.

[alokp, 2016/05/09 21:31:44]

Done.

+  void OnPlaybackEnded();
+  void OnStatisticsUpdate(const PipelineStatistics& stats);
+  void OnBufferingStateChange(BufferingState state);
+  void OnWaitingForDecryptionKey();
 
   // Used to initiate the flush operation once all pending reads have
   // completed.
   void DoFlush_Locked();
 
   // Called when the |decoder_|.Reset() has completed.
   void ResetDecoderDone();
 
   // Called by the AudioBufferStream when a splice buffer is demuxed.
   void OnNewSpliceBuffer(base::TimeDelta);
@@ skipping 20 matching lines @@
   std::unique_ptr<AudioBufferStream> audio_buffer_stream_;
 
   // Interface to the hardware audio params.
   const AudioHardwareConfig& hardware_config_;
 
   scoped_refptr<MediaLog> media_log_;
 
   // Cached copy of hardware params from |hardware_config_|.
   AudioParameters audio_parameters_;
 
-  // Callbacks provided during Initialize().
+  RendererClient* client_;
+
+  // Callback provided during Initialize().
   PipelineStatusCB init_cb_;
-  BufferingStateCB buffering_state_cb_;
-  base::Closure ended_cb_;
-  PipelineStatusCB error_cb_;
-  StatisticsCB statistics_cb_;
 
   // Callback provided to Flush().
   base::Closure flush_cb_;
 
   // Overridable tick clock for testing.
   std::unique_ptr<base::TickClock> tick_clock_;
 
   // Memory usage of |algorithm_| recorded during the last
   // HandleSplicerBuffer_Locked() call.
   int64_t last_audio_memory_usage_;
@@ skipping 58 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_RENDERERS_AUDIO_RENDERER_IMPL_H_