Revert 113895 - <video> decode in hardware!

media/base/filters.h

Index: media/base/filters.h
===================================================================
--- media/base/filters.h	(revision 113907)
+++ media/base/filters.h	(working copy)
@@ -62,8 +62,8 @@
 // Used for completing asynchronous methods.
 typedef base::Callback<void(PipelineStatus)> FilterStatusCB;
 
-// These functions copy |*cb|, call Reset() on |*cb|, and then call Run()
-// on the copy.  This is used in the common case where you need to clear
+// This function copies |*cb|, calls Reset() on |*cb|, and then calls Run()
+// on the copy. This is used in the common case where you need to clear
 // a callback member variable before running the callback.
 MEDIA_EXPORT void ResetAndRunCB(FilterStatusCB* cb, PipelineStatus status);
 MEDIA_EXPORT void ResetAndRunCB(base::Closure* cb);
@@ -81,10 +81,6 @@
   // to be released before the host object is destroyed by the pipeline.
   virtual void set_host(FilterHost* host);
 
-  // Clear |host_| to signal abandonment.  Must be called after set_host() and
-  // before any state-changing method below.
-  virtual void clear_host();
-
   virtual FilterHost* host();
 
   // The pipeline has resumed playback.  Filters can continue requesting reads.
@@ -168,8 +164,9 @@
   // Initialize a VideoDecoder with the given DemuxerStream, executing the
   // callback upon completion.
   // stats_callback is used to update global pipeline statistics.
-  virtual void Initialize(DemuxerStream* stream,
-                          const PipelineStatusCB& callback,
+  //
+  // TODO(scherkus): switch to PipelineStatus callback.
+  virtual void Initialize(DemuxerStream* stream, const base::Closure& callback,
                           const StatisticsCallback& stats_callback) = 0;
 
   // Request a frame to be decoded and returned via the provided callback.
Property changes on: media/base/filters.h
___________________________________________________________________
Added: svn:mergeinfo