Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: webrtc/api/videotracksource.cc

Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Work-in-progress, after applying 1790633002. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 void VideoTrackSource::RemoveSink( 50 void VideoTrackSource::RemoveSink(
51 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) { 51 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
52 if (!source_) { 52 if (!source_) {
53 return; 53 return;
54 } 54 }
55 worker_thread_->Invoke<void>( 55 worker_thread_->Invoke<void>(
56 rtc::Bind(&rtc::VideoSourceInterface<cricket::VideoFrame>::RemoveSink, 56 rtc::Bind(&rtc::VideoSourceInterface<cricket::VideoFrame>::RemoveSink,
57 source_, sink)); 57 source_, sink));
58 } 58 }
59 59
60 void VideoTrackSource::GetInfo(rtc::VideoSourceInfo *info) {
61 if (source_)
62 source_->GetInfo(info);
perkj_webrtc 2016/03/20 15:01:46 Humm. This looks like a potential race with OnSour
nisse-webrtc 2016/03/23 14:07:02 I'd need some guidance on how to get the threading
perkj_webrtc 2016/03/24 11:02:50 That is correct. And should in practice never happ
63 }
64
65
60 } // namespace webrtc 66 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698