MediaResource refactoring to support multiple streams

media/base/renderer.h

 // Copyright 2014 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_RENDERER_H_
 #define MEDIA_BASE_RENDERER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "media/base/buffering_state.h"
 #include "media/base/cdm_context.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 
 namespace media {
 
-class DemuxerStreamProvider;
+class MediaResource;
 class RendererClient;
 
 class MEDIA_EXPORT Renderer {
  public:
   Renderer();
 
   // Stops rendering and fires any pending callbacks.
   virtual ~Renderer();
 
-  // Initializes the Renderer with |demuxer_stream_provider|, executing
-  // |init_cb| upon completion. |demuxer_stream_provider| must be valid for
+  // Initializes the Renderer with |media_resource|, executing
+  // |init_cb| upon completion. |media_resource| must be valid for

[xhwang, 2017/02/01 18:26:03]

nit: please re-flow the comment

[servolk, 2017/02/01 22:29:17]

Done.

   // the lifetime of the Renderer object.  |init_cb| must only be run after this
   // method has returned.  Firing |init_cb| may result in the immediate
   // destruction of the caller, so it must be run only prior to returning.
-  virtual void Initialize(DemuxerStreamProvider* demuxer_stream_provider,
+  virtual void Initialize(MediaResource* media_resource,
                           RendererClient* client,
                           const PipelineStatusCB& init_cb) = 0;
 
   // Associates the |cdm_context| with this Renderer for decryption (and
   // decoding) of media data, then fires |cdm_attached_cb| with the result.
   virtual void SetCdm(CdmContext* cdm_context,
                       const CdmAttachedCB& cdm_attached_cb) = 0;
 
   // The following functions must be called after Initialize().
 
@@ skipping 12 matching lines @@
   // Returns the current media time.
   virtual base::TimeDelta GetMediaTime() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Renderer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_RENDERER_H_