Create CanvasCaptureMediaStreamTrack in a regular MediaStream

content/public/renderer/media_stream_api.cc

 // Copyright 2015 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/public/renderer/media_stream_api.h"
 
 #include "base/base64.h"
 #include "base/callback.h"
 #include "base/rand_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_audio_source.h"
 #include "content/renderer/media/media_stream_video_capturer_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
+#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
 blink::WebString MakeTrackId() {
   std::string track_id;
@@ skipping 95 matching lines @@
 
   blink::WebMediaStreamTrack web_media_audio_track;
   web_media_audio_track.initialize(webkit_source);
   RenderThreadImpl::current()->GetPeerConnectionDependencyFactory()->
       CreateLocalAudioTrack(web_media_audio_track);
 
   web_stream->addTrack(web_media_audio_track);
   return true;
 }
 
+bool AddVideoCapturerSourceToVideoTrack(

[perkj_chrome, 2015/12/08 09:05:06]

This feel like a special case where we create a source after the track. So I
would just put this in CanvasCaptureHandler.

[emircan, 2015/12/08 19:28:01]

Done.

+    scoped_ptr<media::VideoCapturerSource> source,
+    bool is_remote,
+    bool is_readonly,
+    blink::WebMediaStreamTrack* web_track) {
+  const blink::WebString track_id = MakeTrackId();
+  blink::WebMediaStreamSource webkit_source;

[perkj_chrome, 2015/12/08 09:05:06]

please don't call anything webkit. Maybe just web_source.

[emircan, 2015/12/08 19:28:01]

Done. I was following the naming used in Add*TrackToMediaStream() funcs.

+  scoped_ptr<MediaStreamVideoSource> media_stream_source(
+      new MediaStreamVideoCapturerSource(
+          MediaStreamSource::SourceStoppedCallback(), source.Pass()));
+  webkit_source.initialize(track_id, blink::WebMediaStreamSource::TypeVideo,
+                           track_id, is_remote, is_readonly);
+  webkit_source.setExtraData(media_stream_source.get());
+
+  web_track->initialize(webkit_source);
+  blink::WebMediaConstraints constraints;
+  constraints.initialize();
+  web_track->setExtraData(new MediaStreamVideoTrack(
+      media_stream_source.release(), constraints,
+      MediaStreamVideoSource::ConstraintsCallback(), true));
+  return true;
+}
+
 }  // namespace content