Wip - cl for implemening VideoTrackSource::ApplyConstraints(constraints, VideoTrack) and adopt safe…

content/renderer/media/media_stream_video_track.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/media_stream_video_track.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 178 matching lines @@
           media::VideoFrameMetadata::REFERENCE_TIME, &reference_time)) {
     wrapped_black_frame->metadata()->SetTimeTicks(
         media::VideoFrameMetadata::REFERENCE_TIME, reference_time);
   }
 
   return wrapped_black_frame;
 }
 
 // static
 blink::WebMediaStreamTrack MediaStreamVideoTrack::CreateVideoTrack(
-    MediaStreamVideoSource* source,
-    const blink::WebMediaConstraints& constraints,
-    const MediaStreamVideoSource::ConstraintsCallback& callback,
-    bool enabled) {
+    MediaStreamVideoSource* source) {
   blink::WebMediaStreamTrack track;
   track.initialize(source->owner());
-  track.setTrackData(
-      new MediaStreamVideoTrack(source, constraints, callback, enabled));
+  source->ConnectToTrack(track);
+
+  blink::WebMediaConstraints constraints;
+  constraints.initialize();
+  source->ApplyConstraints(track, constraints,
+                           MediaStreamVideoSource::ConstraintsCallback());
+
   return track;
 }
 
 // static
+void MediaStreamVideoTrack::InitializeVideoTrack(MediaStreamVideoSource* source,
+                                                 const blink::WebMediaStreamTrack& track) {
+  DCHECK(!track.isNull());
+  source->ConnectToTrack(track);
+
+  blink::WebMediaConstraints constraints;
+  constraints.initialize();
+  source->ApplyConstraints(track, constraints,
+                           MediaStreamVideoSource::ConstraintsCallback());
+}
+
+// static
 MediaStreamVideoTrack* MediaStreamVideoTrack::GetVideoTrack(
      const blink::WebMediaStreamTrack& track) {
   if (track.isNull() ||
       track.source().getType() != blink::WebMediaStreamSource::TypeVideo) {
     return nullptr;
   }
   return static_cast<MediaStreamVideoTrack*>(track.getTrackData());
 }
 
 MediaStreamVideoTrack::MediaStreamVideoTrack(
-    MediaStreamVideoSource* source,
-    const blink::WebMediaConstraints& constraints,
-    const MediaStreamVideoSource::ConstraintsCallback& callback,
+    base::WeakPtr<MediaStreamVideoSource> source,
     bool enabled)
     : MediaStreamTrack(true),
       frame_deliverer_(
           new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(),
                                                     enabled)),
-      constraints_(constraints),
-      source_(source->GetWeakPtr()) {
-  DCHECK(!constraints.isNull());
-  source->AddTrack(this,
+      source_(source) {
+//  DCHECK(!constraints.isNull());
+/*  source->AddTrack(this,
                    base::Bind(
                        &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
                        frame_deliverer_),
-                   constraints, callback);
+                   constraints, callback);*/
 }
 
 MediaStreamVideoTrack::~MediaStreamVideoTrack() {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   DCHECK(sinks_.empty());
   Stop();
   DVLOG(3) << "~MediaStreamVideoTrack()";
 }
 
+VideoCaptureDeliverFrameCB MediaStreamVideoTrack::frame_input() const {
+  DCHECK(main_render_thread_checker_.CalledOnValidThread());
+  return base::Bind(
+        &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
+        frame_deliverer_);
+}
+
 void MediaStreamVideoTrack::AddSink(MediaStreamVideoSink* sink,
                                     const VideoCaptureDeliverFrameCB& callback,
                                     bool is_sink_secure) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   DCHECK(std::find(sinks_.begin(), sinks_.end(), sink) == sinks_.end());
   sinks_.push_back(sink);
   frame_deliverer_->AddCallback(sink, callback);
   secure_tracker_.Add(sink, is_sink_secure);
   // Request source to deliver a frame because a new sink is added.
   if (source_) {
@@ skipping 47 matching lines @@
 }
 
 void MediaStreamVideoTrack::OnReadyStateChanged(
     blink::WebMediaStreamSource::ReadyState state) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   for (auto* sink : sinks_)
     sink->OnReadyStateChanged(state);
 }
 
 }  // namespace content