summaryrefslogtreecommitdiffstats
path: root/webkit/media/webmediaplayer_proxy.cc
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 23:46:36 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 23:46:36 +0000
commit35c83a09965168db7670efb4803554c0bdc8187f (patch)
tree47cd6abc50b5ff74c1dfd267f94c8f3def09fc49 /webkit/media/webmediaplayer_proxy.cc
parenta9a0b71dc445677a21bf2ff3e7658b1c878de9a2 (diff)
downloadchromium_src-35c83a09965168db7670efb4803554c0bdc8187f.zip
chromium_src-35c83a09965168db7670efb4803554c0bdc8187f.tar.gz
chromium_src-35c83a09965168db7670efb4803554c0bdc8187f.tar.bz2
Implement sourceAddId() & sourceRemoveId()
BUG=122897 TEST=Covered by LayoutTests Review URL: http://codereview.chromium.org/10164017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/webmediaplayer_proxy.cc')
-rw-r--r--webkit/media/webmediaplayer_proxy.cc21
1 files changed, 15 insertions, 6 deletions
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index f6984f0..54661d9 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() {