Move Renderer permanent callbacks into RendererClient interface.

media/base/video_renderer.h

Index: media/base/video_renderer.h
diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h
index ddd47777daa5d4133fb8a66faf6e64a00fe141a8..9a15c76b7bdb48b703484b4bccc56fc5a5b47b00 100644
--- a/media/base/video_renderer.h
+++ b/media/base/video_renderer.h
@@ -5,11 +5,8 @@
 #ifndef MEDIA_BASE_VIDEO_RENDERER_H_
 #define MEDIA_BASE_VIDEO_RENDERER_H_
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/macros.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"
@@ -18,51 +15,28 @@ namespace media {
 
 class CdmContext;
 class DemuxerStream;
-class VideoDecoder;
-class VideoFrame;
+class RendererClient;
 
 class MEDIA_EXPORT VideoRenderer {
  public:
-  // Used to paint VideoFrame.
-  typedef base::Callback<void(const scoped_refptr<VideoFrame>&)> PaintCB;
-
   VideoRenderer();
 
   // Stops all operations and fires all pending callbacks.
   virtual ~VideoRenderer();
 
   // Initializes a VideoRenderer with |stream|, executing |init_cb| upon
-  // completion. If initialization fails, only |init_cb| (not |error_cb|) will
-  // be called.
+  // completion.

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

I think the dropped line still has some value. People could go ahead calling
OnError on Client instead of firing init_cb.

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

Done.

   //
   // |cdm_context| can be used to handle encrypted streams. May be null if the
   // stream is not encrypted.
   //
-  // |statistics_cb| is executed periodically with video rendering stats, such
-  // as dropped frames.
-  //
-  // |buffering_state_cb| is executed when video rendering has either run out of
-  // data or has enough data to continue playback.
-  //
-  // |ended_cb| is executed when video rendering has reached the end of stream.
-  //
-  // |error_cb| is executed if an error was encountered after initialization.
-  //
   // |wall_clock_time_cb| is used to convert media timestamps into wallclock
   // timestamps.
-  //
-  // |waiting_for_decryption_key_cb| is executed whenever the key needed to
-  // decrypt the stream is not available.
-  virtual void Initialize(
-      DemuxerStream* stream,
-      const PipelineStatusCB& init_cb,
-      CdmContext* cdm_context,
-      const StatisticsCB& statistics_cb,
-      const BufferingStateCB& buffering_state_cb,
-      const base::Closure& ended_cb,
-      const PipelineStatusCB& error_cb,
-      const TimeSource::WallClockTimeCB& wall_clock_time_cb,
-      const base::Closure& waiting_for_decryption_key_cb) = 0;
+  virtual void Initialize(RendererClient* client,

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

ditto about parameter order

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

Done.

+                          DemuxerStream* stream,
+                          CdmContext* cdm_context,
+                          const TimeSource::WallClockTimeCB& wall_clock_time_cb,
+                          const PipelineStatusCB& init_cb) = 0;
 
   // Discards any video data and stops reading from |stream|, executing
   // |callback| when completed.