MediaResource refactoring to support multiple streams

media/base/demuxer_stream.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_STREAM_H_
 #define MEDIA_BASE_DEMUXER_STREAM_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
@@ skipping 76 matching lines @@
   // A DemuxerStream that returns 'true' to this may return the 'kConfigChange'
   // status from a Read() call. In this case the client is expected to be
   // capable of taking appropriate action to handle config changes. Otherwise
   // audio_decoder_config() and video_decoder_config()'s return values are
   // guaranteed to remain constant, and the client may make optimizations based
   // on this.
   virtual bool SupportsConfigChanges() = 0;
 
   virtual VideoRotation video_rotation() = 0;
 
+  // TODO(servolk): Remove enabled / set_enabled methods from DemuxerStream
+  // interface, since those are only called from demuxers.
+
   // Indicates whether a DemuxerStream is currently enabled (i.e. should be
   // decoded and rendered) or not.
   virtual bool enabled() const = 0;
 
   // Disables and re-enables the stream. Reading from a disabled stream will
   // return an end-of-stream (EOS) buffer. When a stream is re-enabled, it needs
   // to know the current playback position |timestamp| in order to resume
   // reading data from a key frame preceeding the |timestamp|.
   virtual void set_enabled(bool enabled, base::TimeDelta timestamp) = 0;
 
-  // The StreamStatusChangeCB allows DemuxerStream clients to receive
-  // notifications about the stream being disabled or enabled.
-  // The first parameter indicates whether the stream is enabled or disabled.
-  // The second parameter is the playback position when the change occured.
-  using StreamStatusChangeCB = base::Callback<void(bool, base::TimeDelta)>;
-  virtual void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) = 0;
-
  protected:
   // Only allow concrete implementations to get deleted.
   virtual ~DemuxerStream();
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DEMUXER_STREAM_H_