Separate DemuxerHost from DataSourceHost.

media/base/demuxer.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_BASE_DEMUXER_H_
 #define MEDIA_BASE_DEMUXER_H_
 
 #include <vector>
 
 #include "base/time/time.h"
 #include "media/base/data_source.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 
 namespace media {
 
 class TextTrackConfig;
 
-class MEDIA_EXPORT DemuxerHost : public DataSourceHost {
+class MEDIA_EXPORT DemuxerHost {
  public:
+  // Notify the host that time range [start,end] has been buffered.
+  virtual void AddBufferedTimeRange(base::TimeDelta start,
+                                    base::TimeDelta end) = 0;
+
   // Sets the duration of the media in microseconds.
   // Duration may be kInfiniteDuration() if the duration is not known.
   virtual void SetDuration(base::TimeDelta duration) = 0;
 
   // Stops execution of the pipeline due to a fatal error.  Do not call this
   // method with PIPELINE_OK.
   virtual void OnDemuxerError(PipelineStatus error) = 0;
 
   // Add |text_stream| to the collection managed by the text renderer.
   virtual void AddTextStream(DemuxerStream* text_stream,
                              const TextTrackConfig& config) = 0;
 
-  // Remove |text_stream| from the presentation.
-  virtual void RemoveTextStream(DemuxerStream* text_stream) = 0;

[scherkus (not reviewing), 2014/03/26 21:50:12]

what happened to this method?

[sandersd (OOO until July 31), 2014/03/26 22:11:12]

It's never called, but this is the right place for it. I'll put it back.

-
  protected:
   virtual ~DemuxerHost();
 };
 
 class MEDIA_EXPORT Demuxer {
  public:
   // A new potentially encrypted stream has been parsed.
   // First parameter - The type of initialization data.
   // Second parameter - The initialization data associated with the stream.
   typedef base::Callback<void(const std::string& type,
@@ skipping 36 matching lines @@
   // Returns the starting time for the media file.
   virtual base::TimeDelta GetStartTime() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Demuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DEMUXER_H_