| Index: webkit/media/webmediaplayer_proxy.h
|
| diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
|
| index 83fab2f1e672d5cc183ac8057c534fefd3daf4bb..8d6a6b4a4734c3e25e079fcff77597e0f4710f20 100644
|
| --- a/webkit/media/webmediaplayer_proxy.h
|
| +++ b/webkit/media/webmediaplayer_proxy.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/synchronization/lock.h"
|
| #include "media/base/pipeline.h"
|
| +#include "media/filters/chunk_demuxer.h"
|
| #include "media/filters/chunk_demuxer_client.h"
|
| #include "media/filters/ffmpeg_video_decoder.h"
|
| #include "webkit/media/buffered_data_source.h"
|
| @@ -88,7 +89,10 @@ class WebMediaPlayerProxy
|
|
|
| // Methods for Demuxer communication.
|
| void DemuxerFlush();
|
| - bool DemuxerAppend(const uint8* data, size_t length);
|
| + media::ChunkDemuxer::Status DemuxerAddId(const std::string& id,
|
| + const std::string& type);
|
| + bool DemuxerRemoveId(const std::string& id);
|
| + bool DemuxerAppend(const std::string& id, const uint8* data, size_t length);
|
| void DemuxerEndOfStream(media::PipelineStatus status);
|
| void DemuxerShutdown();
|
|
|
|
|