Move VideoRenderer out of Filter heirarchy.

media/filters/video_renderer_base.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.
 
 #ifndef MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 #define MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
@@ skipping 28 matching lines @@
   // down the video thread may result in losing synchronization with audio.
   //
   // Setting |drop_frames_| to true causes the renderer to drop expired frames.
   //
   // TODO(scherkus): pass the VideoFrame* to this callback and remove
   // Get/PutCurrentFrame() http://crbug.com/108435
   VideoRendererBase(const base::Closure& paint_cb,
                     const SetOpaqueCB& set_opaque_cb,
                     bool drop_frames);
 
-  // Filter implementation.
-  virtual void SetHost(FilterHost* host) OVERRIDE;
+  // VideoRenderer implementation.
+  virtual void Initialize(const scoped_refptr<VideoDecoder>& decoder,
+                          const PipelineStatusCB& init_cb,
+                          const StatisticsCB& statistics_cb,
+                          const TimeCB& time_cb,
+                          const NaturalSizeChangedCB& size_changed_cb,
+                          const base::Closure& ended_cb,
+                          const PipelineStatusCB& error_cb,
+                          const TimeDeltaCB& get_time_cb,
+                          const TimeDeltaCB& get_duration_cb) OVERRIDE;
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
+  virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
-  virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
-
-  // VideoRenderer implementation.
-  virtual void Initialize(const scoped_refptr<VideoDecoder>& decoder,
-                          const PipelineStatusCB& status_cb,
-                          const StatisticsCB& statistics_cb,
-                          const TimeCB& time_cb) OVERRIDE;
   virtual bool HasEnded() OVERRIDE;
 
   // PlatformThread::Delegate implementation.
   virtual void ThreadMain() OVERRIDE;
 
   // Clients of this class (painter/compositor) should use GetCurrentFrame()
   // obtain ownership of VideoFrame, it should always relinquish the ownership
   // by use PutCurrentFrame(). Current frame is not guaranteed to be non-NULL.
   // It expects clients to use color-fill the background if current frame
   // is NULL. This could happen before pipeline is pre-rolled or during
@@ skipping 30 matching lines @@
 
   // Safely handles entering to an error state.
   void EnterErrorState_Locked(PipelineStatus status);
 
   // Helper function that flushes the buffers when a Stop() or error occurs.
   void DoStopOrError_Locked();
 
   // Return the number of frames currently held by this class.
   int NumFrames_Locked() const;
 
-  FilterHost* host_;
-
   // Used for accessing data members.
   base::Lock lock_;
 
   scoped_refptr<VideoDecoder> decoder_;
 
   // Queue of incoming frames as well as the current frame since the last time
   // OnFrameAvailable() was called.
   typedef std::deque<scoped_refptr<VideoFrame> > VideoFrameQueue;
   VideoFrameQueue ready_frames_;
 
@@ skipping 66 matching lines @@
   // Flushing cannot complete until both |pending_read_| and |pending_paint_|
   // are false.
   bool pending_read_;
   bool pending_paint_;
   bool pending_paint_with_last_available_;
 
   bool drop_frames_;
 
   float playback_rate_;
 
-  // Filter callbacks.
+  // Playback operation callbacks.
   base::Closure flush_cb_;
   PipelineStatusCB seek_cb_;
+
+  // Event callbacks.
   StatisticsCB statistics_cb_;
   TimeCB time_cb_;
+  NaturalSizeChangedCB size_changed_cb_;
+  base::Closure ended_cb_;
+  PipelineStatusCB error_cb_;
+  TimeDeltaCB get_time_cb_;
+  TimeDeltaCB get_duration_cb_;
 
   base::TimeDelta seek_timestamp_;
 
   // Embedder callback for notifying a new frame is available for painting.
   base::Closure paint_cb_;
 
   // Callback to execute to inform the player if the video decoder's output is
   // opaque.
   SetOpaqueCB set_opaque_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_