WIP fixing/extending acolwell's init-segment-received patch

content/renderer/media/webmediasource_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/webmediasource_impl.h"
 
+#include "base/bind.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"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using ::blink::WebString;
 using ::blink::WebMediaSource;
 
 namespace content {
@@ skipping 18 matching lines @@
 
 WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
     const blink::WebString& type,
     const blink::WebVector<blink::WebString>& codecs,
     blink::WebSourceBuffer** source_buffer) {
   std::string id = base::GenerateGUID();
   std::vector<std::string> new_codecs(codecs.size());
   for (size_t i = 0; i < codecs.size(); ++i)
     new_codecs[i] = codecs[i].utf8().data();
 
+  scoped_ptr<WebSourceBufferImpl> web_source_buffer(
+      new WebSourceBufferImpl(id, demuxer_));
+
   WebMediaSource::AddStatus result =
       static_cast<WebMediaSource::AddStatus>(
-          demuxer_->AddId(id, type.utf8().data(), new_codecs));
+          demuxer_->AddId(
+              id,
+              type.utf8().data(),
+              new_codecs,
+              base::Bind(&WebSourceBufferImpl::OnNewInitSegment,
+                         base::Unretained(web_source_buffer.get()))));
 
   if (result == WebMediaSource::AddStatusOk)
-    *source_buffer = new WebSourceBufferImpl(id, demuxer_);
+    *source_buffer = web_source_buffer.release();
 
   return result;
 }
 
 double WebMediaSourceImpl::duration() {
   return demuxer_->GetDuration();
 }
 
 void WebMediaSourceImpl::setDuration(double new_duration) {
   DCHECK_GE(new_duration, 0);
@@ skipping 16 matching lines @@
   }
 
   demuxer_->MarkEndOfStream(pipeline_status);
 }
 
 void WebMediaSourceImpl::unmarkEndOfStream() {
   demuxer_->UnmarkEndOfStream();
 }
 
 }  // namespace content