Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: webkit/media/webmediaplayer_proxy.cc

Issue 10164017: Implement sourceAddId() & sourceRemoveId() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor style fixes Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/filters/chunk_demuxer.cc ('K') | « webkit/media/webmediaplayer_proxy.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_proxy.cc
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index f6984f0e4603df35ecd88fb87f4b3724c962edc8..ae04d45084ca720c2d0eecd750a20b7c9f56cdfe 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);
+}
+
+bool WebMediaPlayerProxy::DemuxerRemoveId(const std::string& id) {
+ return 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() {
« media/filters/chunk_demuxer.cc ('K') | « webkit/media/webmediaplayer_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698