OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 } // anonymous namespace | 255 } // anonymous namespace |
256 | 256 |
257 namespace webrtc { | 257 namespace webrtc { |
258 | 258 |
259 rtc::scoped_refptr<VideoTrackSourceInterface> VideoCapturerTrackSource::Create( | 259 rtc::scoped_refptr<VideoTrackSourceInterface> VideoCapturerTrackSource::Create( |
260 rtc::Thread* worker_thread, | 260 rtc::Thread* worker_thread, |
261 std::unique_ptr<cricket::VideoCapturer> capturer, | 261 std::unique_ptr<cricket::VideoCapturer> capturer, |
262 const webrtc::MediaConstraintsInterface* constraints, | 262 const webrtc::MediaConstraintsInterface* constraints, |
263 bool remote) { | 263 bool remote) { |
264 RTC_DCHECK(worker_thread != NULL); | 264 RTC_DCHECK(worker_thread != NULL); |
265 RTC_DCHECK(capturer != NULL); | 265 RTC_DCHECK(capturer != nullptr); |
266 rtc::scoped_refptr<VideoCapturerTrackSource> source( | 266 rtc::scoped_refptr<VideoCapturerTrackSource> source( |
267 new rtc::RefCountedObject<VideoCapturerTrackSource>( | 267 new rtc::RefCountedObject<VideoCapturerTrackSource>( |
268 worker_thread, std::move(capturer), remote)); | 268 worker_thread, std::move(capturer), remote)); |
269 source->Initialize(constraints); | 269 source->Initialize(constraints); |
270 return source; | 270 return source; |
271 } | 271 } |
272 | 272 |
273 rtc::scoped_refptr<VideoTrackSourceInterface> VideoCapturerTrackSource::Create( | 273 rtc::scoped_refptr<VideoTrackSourceInterface> VideoCapturerTrackSource::Create( |
274 rtc::Thread* worker_thread, | 274 rtc::Thread* worker_thread, |
275 std::unique_ptr<cricket::VideoCapturer> capturer, | 275 std::unique_ptr<cricket::VideoCapturer> capturer, |
276 bool remote) { | 276 bool remote) { |
277 RTC_DCHECK(worker_thread != NULL); | 277 RTC_DCHECK(worker_thread != NULL); |
278 RTC_DCHECK(capturer != NULL); | 278 RTC_DCHECK(capturer != nullptr); |
279 rtc::scoped_refptr<VideoCapturerTrackSource> source( | 279 rtc::scoped_refptr<VideoCapturerTrackSource> source( |
280 new rtc::RefCountedObject<VideoCapturerTrackSource>( | 280 new rtc::RefCountedObject<VideoCapturerTrackSource>( |
281 worker_thread, std::move(capturer), remote)); | 281 worker_thread, std::move(capturer), remote)); |
282 source->Initialize(nullptr); | 282 source->Initialize(nullptr); |
283 return source; | 283 return source; |
284 } | 284 } |
285 | 285 |
286 VideoCapturerTrackSource::VideoCapturerTrackSource( | 286 VideoCapturerTrackSource::VideoCapturerTrackSource( |
287 rtc::Thread* worker_thread, | 287 rtc::Thread* worker_thread, |
288 std::unique_ptr<cricket::VideoCapturer> capturer, | 288 std::unique_ptr<cricket::VideoCapturer> capturer, |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 rtc::Unretained(this), capturer, capture_state)); | 392 rtc::Unretained(this), capturer, capture_state)); |
393 return; | 393 return; |
394 } | 394 } |
395 | 395 |
396 if (capturer == video_capturer_.get()) { | 396 if (capturer == video_capturer_.get()) { |
397 SetState(GetReadyState(capture_state)); | 397 SetState(GetReadyState(capture_state)); |
398 } | 398 } |
399 } | 399 } |
400 | 400 |
401 } // namespace webrtc | 401 } // namespace webrtc |
OLD | NEW |