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

Unified Diff: content/renderer/media/webmediasourceclient_impl.cc

Issue 19649007: Update the WebMediaSourceClientImpl & ChunkDemuxer to received explicit end of stream cancellation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make chromium style enforcers happy Created 7 years, 5 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
« no previous file with comments | « content/renderer/media/webmediasourceclient_impl.h ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediasourceclient_impl.cc
diff --git a/content/renderer/media/webmediasourceclient_impl.cc b/content/renderer/media/webmediasourceclient_impl.cc
index 1aef77393fd1a8fd13d983d0ed3dea3730080c79..66a3f02bb12dc7a1e4ae2c3040a4d6127706c5ed 100644
--- a/content/renderer/media/webmediasourceclient_impl.cc
+++ b/content/renderer/media/webmediasourceclient_impl.cc
@@ -60,8 +60,14 @@ void WebMediaSourceClientImpl::setDuration(double new_duration) {
demuxer_->SetDuration(new_duration);
}
+// TODO(acolwell): Remove this once endOfStream() is removed from Blink.
void WebMediaSourceClientImpl::endOfStream(
WebMediaSourceClient::EndOfStreamStatus status) {
+ markEndOfStream(status);
+}
+
+void WebMediaSourceClientImpl::markEndOfStream(
+ WebMediaSourceClient::EndOfStreamStatus status) {
media::PipelineStatus pipeline_status = media::PIPELINE_OK;
switch (status) {
@@ -77,7 +83,11 @@ void WebMediaSourceClientImpl::endOfStream(
NOTIMPLEMENTED();
}
- demuxer_->EndOfStream(pipeline_status);
+ demuxer_->MarkEndOfStream(pipeline_status);
+}
+
+void WebMediaSourceClientImpl::unmarkEndOfStream() {
+ demuxer_->UnmarkEndOfStream();
}
} // namespace content
« no previous file with comments | « content/renderer/media/webmediasourceclient_impl.h ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698