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

media/base/pipeline_impl.h

Index: media/base/pipeline_impl.h
===================================================================
--- media/base/pipeline_impl.h	(revision 23335)
+++ media/base/pipeline_impl.h	(working copy)
@@ -41,8 +41,10 @@
 //         |                                              |
 //         V      Seek()                                  |
 //   [ Started ] --------> [ Pausing (for each filter) ] -'
+//         |                                              |
+//         |   NotifyEnded()                Seek()        |
+//         `-------------> [ Ended ] ---------------------'
 //
-//
 //                  SetError()
 //   [ Any State ] -------------> [ Error ]
 //         |          Stop()
@@ -84,8 +86,12 @@
   virtual bool IsStreaming() const;
   virtual PipelineError GetError() const;
 
+  // Sets a permanent callback owned by the pipeline that will be executed when
+  // the media reaches the end.
+  virtual void SetPipelineEndedCallback(PipelineCallback* ended_callback);
+
   // |error_callback_| will be executed upon an error in the pipeline. If
-  // |error_callback_| is NULL, it is ignored. The pipeline takes ownernship
+  // |error_callback_| is NULL, it is ignored. The pipeline takes ownership
   // of |error_callback|.
   virtual void SetPipelineErrorCallback(PipelineCallback* error_callback);
 
@@ -103,6 +109,7 @@
     kSeeking,
     kStarting,
     kStarted,
+    kEnded,
     kStopped,
     kError,
   };
@@ -136,6 +143,7 @@
   virtual void SetBufferedBytes(int64 buffered_bytes);
   virtual void SetVideoSize(size_t width, size_t height);
   virtual void SetStreaming(bool streamed);
+  virtual void NotifyEnded();
   virtual void BroadcastMessage(FilterMessage message);
 
   // Method called during initialization to insert a mime type into the
@@ -181,6 +189,9 @@
   // Carries out notifying filters that we are seeking to a new timestamp.
   void SeekTask(base::TimeDelta time, PipelineCallback* seek_callback);
 
+  // Carries out handling a notification from a filter that it has ended.
+  void NotifyEndedTask();
+
   // Carries out message broadcasting on the message loop.
   void BroadcastMessageTask(FilterMessage message);
 
@@ -332,6 +343,7 @@
   // Callbacks for various pipeline operations.
   scoped_ptr<PipelineCallback> seek_callback_;
   scoped_ptr<PipelineCallback> stop_callback_;
+  scoped_ptr<PipelineCallback> ended_callback_;
   scoped_ptr<PipelineCallback> error_callback_;
 
   // Vector of our filters and map maintaining the relationship between the
Property changes on: media\base\pipeline_impl.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/media/base/pipeline_impl.h:r23255