| Index: media/blink/webmediaplayer_impl.h
|
| diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
|
| index 989964532379f96be5117c5da06ee0296c0abe93..64d5944c5689561d91d25332d897ccca3a094faa 100644
|
| --- a/media/blink/webmediaplayer_impl.h
|
| +++ b/media/blink/webmediaplayer_impl.h
|
| @@ -22,6 +22,7 @@
|
| #include "media/blink/buffered_data_source.h"
|
| #include "media/blink/buffered_data_source_host_impl.h"
|
| #include "media/blink/encrypted_media_player_support.h"
|
| +#include "media/blink/multibuffer_data_source.h"
|
| #include "media/blink/skcanvas_video_renderer.h"
|
| #include "media/blink/video_frame_compositor.h"
|
| #include "media/blink/webmediaplayer_params.h"
|
| @@ -54,6 +55,7 @@ class ChunkDemuxer;
|
| class GpuVideoAcceleratorFactories;
|
| class MediaLog;
|
| class VideoFrameCompositor;
|
| +class ResourceMultiBuffer;
|
| class WebAudioSourceProviderImpl;
|
| class WebMediaPlayerDelegate;
|
| class WebTextTrackImpl;
|
| @@ -77,6 +79,7 @@ class MEDIA_EXPORT WebMediaPlayerImpl
|
| base::WeakPtr<WebMediaPlayerDelegate> delegate,
|
| scoped_ptr<RendererFactory> renderer_factory,
|
| CdmFactory* cdm_factory,
|
| + ResourceMultiBuffer* resource_multibuffer,
|
| const WebMediaPlayerParams& params);
|
| ~WebMediaPlayerImpl() override;
|
|
|
| @@ -311,11 +314,12 @@ class MEDIA_EXPORT WebMediaPlayerImpl
|
| //
|
| // |demuxer_| will contain the appropriate demuxer based on which resource
|
| // load strategy we're using.
|
| - scoped_ptr<BufferedDataSource> data_source_;
|
| + scoped_ptr<BufferedDataSourceInterface> data_source_;
|
| scoped_ptr<Demuxer> demuxer_;
|
| ChunkDemuxer* chunk_demuxer_;
|
|
|
| BufferedDataSourceHostImpl buffered_data_source_host_;
|
| + ResourceMultiBuffer* resource_multibuffer_;
|
|
|
| // Video rendering members.
|
| scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
|
|
|