Update the WebMediaSourceClientImpl & ChunkDemuxer to received explicit end of stream cancellation.

content/renderer/media/webmediasourceclient_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webmediasourceclient_impl.h"
 
 #include "base/guid.h"
 #include "content/renderer/media/websourcebuffer_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
@@ skipping 42 matching lines @@
 
 double WebMediaSourceClientImpl::duration() {
   return demuxer_->GetDuration();
 }
 
 void WebMediaSourceClientImpl::setDuration(double new_duration) {
   DCHECK_GE(new_duration, 0);
   demuxer_->SetDuration(new_duration);
 }
 
-void WebMediaSourceClientImpl::endOfStream(
+void WebMediaSourceClientImpl::markEndOfStream(
     WebMediaSourceClient::EndOfStreamStatus status) {
   media::PipelineStatus pipeline_status = media::PIPELINE_OK;
 
   switch (status) {
     case WebMediaSourceClient::EndOfStreamStatusNoError:
       break;
     case WebMediaSourceClient::EndOfStreamStatusNetworkError:
       pipeline_status = media::PIPELINE_ERROR_NETWORK;
       break;
     case WebMediaSourceClient::EndOfStreamStatusDecodeError:
       pipeline_status = media::PIPELINE_ERROR_DECODE;
       break;
     default:
       NOTIMPLEMENTED();
   }
 
-  demuxer_->EndOfStream(pipeline_status);
+  demuxer_->MarkEndOfStream(pipeline_status);
 }
 
+void WebMediaSourceClientImpl::unmarkEndOfStream() {
+  demuxer_->UnmarkEndOfStream();
+}
+

[scherkus (not reviewing), 2013/07/19 20:35:47]

remove extra blank

[acolwell GONE FROM CHROMIUM, 2013/07/19 20:45:54]

Done.

+
 }  // namespace content