Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / media / base / demuxer.h

diff --git a/src/media/base/demuxer.h b/src/media/base/demuxer.h
index df00a74..fb27bc9 100644 (file)
--- a/src/media/base/demuxer.h
+++ b/src/media/base/demuxer.h
@@ -10,6 +10,7 @@
 #include "base/time/time.h"
 #include "media/base/data_source.h"
 #include "media/base/demuxer_stream.h"
+#include "media/base/demuxer_stream_provider.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 
@@ -42,14 +43,8 @@ class MEDIA_EXPORT DemuxerHost {
   virtual ~DemuxerHost();
 };
 
-class MEDIA_EXPORT Demuxer {
+class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider {
  public:
-  enum Liveness {
-    LIVENESS_UNKNOWN,
-    LIVENESS_RECORDED,
-    LIVENESS_LIVE,
-  };
-
   // A new potentially encrypted stream has been parsed.
   // First parameter - The type of initialization data.
   // Second parameter - The initialization data associated with the stream.
@@ -72,15 +67,11 @@ class MEDIA_EXPORT Demuxer {
   virtual void Seek(base::TimeDelta time,
                     const PipelineStatusCB& status_cb) = 0;
 
-  // Starts stopping this demuxer, executing the callback upon completion.
+  // Stops this demuxer.
   //
-  // After the callback completes the demuxer may be destroyed. It is illegal to
-  // call any method (including Stop()) after a demuxer has stopped.
-  virtual void Stop(const base::Closure& callback) = 0;
-
-  // Returns the first stream of the given stream type (which is not allowed
-  // to be DemuxerStream::TEXT), or NULL if that type of stream is not present.
-  virtual DemuxerStream* GetStream(DemuxerStream::Type type) = 0;
+  // After this call the demuxer may be destroyed. It is illegal to call any
+  // method (including Stop()) after a demuxer has stopped.
+  virtual void Stop() = 0;
 
   // Returns the starting time for the media file; it's always positive.
   virtual base::TimeDelta GetStartTime() const = 0;
@@ -90,9 +81,6 @@ class MEDIA_EXPORT Demuxer {
   // a null Time is returned.
   virtual base::Time GetTimelineOffset() const = 0;
 
-  // Returns liveness of the stream, i.e. whether it is recorded or live.
-  virtual Liveness GetLiveness() const = 0;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(Demuxer);
 };