Merge 23255 - Implemented endofstream callback for media::PipelineImpl....

media/filters/video_renderer_base.h

Index: media/filters/video_renderer_base.h
===================================================================
--- media/filters/video_renderer_base.h	(revision 23335)
+++ media/filters/video_renderer_base.h	(working copy)
@@ -45,6 +45,7 @@
 
   // VideoRenderer implementation.
   virtual void Initialize(VideoDecoder* decoder, FilterCallback* callback);
+  virtual bool HasEnded();
 
   // PlatformThread::Delegate implementation.
   virtual void ThreadMain();
@@ -91,10 +92,6 @@
   base::TimeDelta CalculateSleepDuration(VideoFrame* next_frame,
                                          float playback_rate);
 
-  // Allocates YV12 frame based on |width_| and |height_|, and sets its data to
-  // the YUV equivalent of RGB(0,0,0).
-  void CreateBlackFrame(scoped_refptr<VideoFrame>* frame_out);
-
   // Used for accessing data members.
   Lock lock_;
 
@@ -120,6 +117,7 @@
     kPaused,
     kSeeking,
     kPlaying,
+    kEnded,
     kStopped,
     kError,
   };
Property changes on: media\filters\video_renderer_base.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/media/filters/video_renderer_base.h:r23255