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

content/renderer/media/user_media_client_impl.cc

 // Copyright (c) 2012 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/user_media_client_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 655 matching lines @@
     blink::WebVector<blink::WebMediaStreamTrack>* webkit_tracks,
     UserMediaRequestInfo* request) {
   DCHECK_EQ(devices.size(), webkit_tracks->size());
 
   for (size_t i = 0; i < devices.size(); ++i) {
     blink::WebMediaStreamSource webkit_source;
     InitializeSourceObject(devices[i],
                            blink::WebMediaStreamSource::TypeVideo,
                            constraints,
                            &webkit_source);
-    (*webkit_tracks)[i] =
-        request->CreateAndStartVideoTrack(webkit_source, constraints);
+    (*webkit_tracks)[i].initialize(webkit_source);
+    request->StartVideoTrack((*webkit_tracks)[i], constraints);
   }
 }
 
 void UserMediaClientImpl::CreateAudioTracks(
     const StreamDeviceInfoArray& devices,
     const blink::WebMediaConstraints& constraints,
     blink::WebVector<blink::WebMediaStreamTrack>* webkit_tracks,
     UserMediaRequestInfo* request) {
   DCHECK_EQ(devices.size(), webkit_tracks->size());
 
@@ skipping 415 matching lines @@
   DCHECK(native_source);
 
   sources_.push_back(track.source());
   sources_waiting_for_callback_.push_back(native_source);
   if (native_source->ConnectToTrack(track))
     OnTrackStarted(native_source, MEDIA_DEVICE_OK, "");
   else
     OnTrackStarted(native_source, MEDIA_DEVICE_TRACK_START_FAILURE, "");
 }
 
-blink::WebMediaStreamTrack
-UserMediaClientImpl::UserMediaRequestInfo::CreateAndStartVideoTrack(
-    const blink::WebMediaStreamSource& source,
+void UserMediaClientImpl::UserMediaRequestInfo::StartVideoTrack(
+    const blink::WebMediaStreamTrack& track,
     const blink::WebMediaConstraints& constraints) {
-  DCHECK(source.getType() == blink::WebMediaStreamSource::TypeVideo);
+  DCHECK(track.source().getType() == blink::WebMediaStreamSource::TypeVideo);
   MediaStreamVideoSource* native_source =
-      MediaStreamVideoSource::GetVideoSource(source);
+      MediaStreamVideoSource::GetVideoSource(track.source());
+
   DCHECK(native_source);
-  sources_.push_back(source);
+  sources_.push_back(track.source());
   sources_waiting_for_callback_.push_back(native_source);
-  return MediaStreamVideoTrack::CreateVideoTrack(
-      native_source, constraints, base::Bind(
-          &UserMediaClientImpl::UserMediaRequestInfo::OnTrackStarted,
-          AsWeakPtr()),
-      true);
+  if (native_source->ConnectToTrack(track)) {
+    native_source->ApplyConstraints(track, constraints, base::Bind(
+        &UserMediaClientImpl::UserMediaRequestInfo::OnTrackStarted,
+        AsWeakPtr()));
+  } else {
+    OnTrackStarted(native_source, MEDIA_DEVICE_TRACK_START_FAILURE, "");
+  }
 }
 
 void UserMediaClientImpl::UserMediaRequestInfo::CallbackOnTracksStarted(
     const ResourcesReady& callback) {
   DCHECK(ready_callback_.is_null());
   ready_callback_ = callback;
   CheckAllTracksStarted();
 }
 
 void UserMediaClientImpl::UserMediaRequestInfo::OnTrackStarted(
@@ skipping 48 matching lines @@
 
 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const {
   return !sources_waiting_for_callback_.empty();
 }
 
 void UserMediaClientImpl::OnDestruct() {
   delete this;
 }
 
 }  // namespace content