MediaResource refactoring to support multiple streams

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 <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #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/eme_constants.h"
 #include "media/base/media_export.h"
+#include "media/base/media_resource.h"
 #include "media/base/media_track.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/ranges.h"
 
 namespace media {
 
 class TextTrackConfig;
 class MediaTracks;
 
 class MEDIA_EXPORT DemuxerHost {
@@ skipping 21 matching lines @@
   virtual void AddTextStream(DemuxerStream* text_stream,
                              const TextTrackConfig& config) = 0;
 
   // Remove |text_stream| from the presentation.
   virtual void RemoveTextStream(DemuxerStream* text_stream) = 0;
 
  protected:
   virtual ~DemuxerHost();
 };
 
-class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider {
+class MEDIA_EXPORT Demuxer : public MediaResource {
  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.
   using EncryptedMediaInitDataCB =
       base::Callback<void(EmeInitDataType type,
                           const std::vector<uint8_t>& init_data)>;
 
   // Notifies demuxer clients that media track configuration has been updated
   // (e.g. the initial stream metadata has been parsed successfully, or a new
@@ skipping 78 matching lines @@
       const std::vector<MediaTrack::Id>& track_ids,
       base::TimeDelta currTime) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Demuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DEMUXER_H_