Index: webkit/media/webmediaplayer_proxy.cc |
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc |
index f6984f0e4603df35ecd88fb87f4b3724c962edc8..54661d9e1444d4db5e06656ffee47a12122eeddd 100644 |
--- a/webkit/media/webmediaplayer_proxy.cc |
+++ b/webkit/media/webmediaplayer_proxy.cc |
@@ -187,15 +187,24 @@ void WebMediaPlayerProxy::DemuxerFlush() { |
chunk_demuxer_->FlushData(); |
} |
-bool WebMediaPlayerProxy::DemuxerAppend(const uint8* data, size_t length) { |
- if (chunk_demuxer_.get()) |
- return chunk_demuxer_->AppendData(data, length); |
- return false; |
+media::ChunkDemuxer::Status WebMediaPlayerProxy::DemuxerAddId( |
+ const std::string& id, |
+ const std::string& type) { |
+ return chunk_demuxer_->AddId(id, type); |
+} |
+ |
+void WebMediaPlayerProxy::DemuxerRemoveId(const std::string& id) { |
+ chunk_demuxer_->RemoveId(id); |
+} |
+ |
+bool WebMediaPlayerProxy::DemuxerAppend(const std::string& id, |
+ const uint8* data, |
+ size_t length) { |
+ return chunk_demuxer_->AppendData(id, data, length); |
} |
void WebMediaPlayerProxy::DemuxerEndOfStream(media::PipelineStatus status) { |
- if (chunk_demuxer_.get()) |
- chunk_demuxer_->EndOfStream(status); |
+ chunk_demuxer_->EndOfStream(status); |
} |
void WebMediaPlayerProxy::DemuxerShutdown() { |