media: Introduce DemuxerStreamProvider interface.

media/filters/renderer_impl.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_FILTERS_RENDERER_IMPL_H_
 #define MEDIA_FILTERS_RENDERER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time/clock.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "media/base/buffering_state.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class AudioRenderer;
-class Demuxer;
+class DemuxerStreamProvider;
 class TimeSource;
 class VideoRenderer;
 class WallClockTimeSource;
 
 class MEDIA_EXPORT RendererImpl : public Renderer {
  public:
-  // Renders audio/video streams in |demuxer| using |audio_renderer| and
-  // |video_renderer| provided. All methods except for GetMediaTime() run on the
-  // |task_runner|. GetMediaTime() runs on the render main thread because it's
-  // part of JS sync API.
+  // Renders audio/video streams in |demuxer_stream_provider| using
+  // |audio_renderer| and |video_renderer| provided. All methods except for
+  // GetMediaTime() run on the |task_runner|. GetMediaTime() runs on the render
+  // main thread because it's part of JS sync API.
   RendererImpl(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
-               Demuxer* demuxer,
+               DemuxerStreamProvider* demuxer_stream_provider,
                scoped_ptr<AudioRenderer> audio_renderer,
                scoped_ptr<VideoRenderer> video_renderer);
 
   virtual ~RendererImpl();
 
   // Renderer implementation.
   virtual void Initialize(const base::Closure& init_cb,
                           const StatisticsCB& statistics_cb,
                           const base::Closure& ended_cb,
                           const PipelineStatusCB& error_cb,
@@ skipping 61 matching lines @@
   // Callback executed when a runtime error happens.
   void OnError(PipelineStatus error);
 
   void FireAllPendingCallbacks();
 
   State state_;
 
   // Task runner used to execute pipeline tasks.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  Demuxer* demuxer_;
+  DemuxerStreamProvider* demuxer_stream_provider_;
 
   // Permanent callbacks to notify various renderer states/stats.
   StatisticsCB statistics_cb_;
   base::Closure ended_cb_;
   PipelineStatusCB error_cb_;
   BufferingStateCB buffering_state_cb_;
 
   // Temporary callback used for Initialize() and Flush().
   base::Closure init_cb_;
   base::Closure flush_cb_;
@@ skipping 22 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<RendererImpl> weak_factory_;
   base::WeakPtr<RendererImpl> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_RENDERER_IMPL_H_