Extended proxy abstraction, to call certain methods to the worker thread.

webrtc/api/videotrack.cc

 /*
  *  Copyright 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 13 matching lines @@
 }
 
 VideoTrack::~VideoTrack() {
   video_source_->UnregisterObserver(this);
 }
 
 std::string VideoTrack::kind() const {
   return kVideoKind;
 }
 
+// AddOrUpdateSink and RemoveSink should be called on the worker
+// thread.
 void VideoTrack::AddOrUpdateSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
     const rtc::VideoSinkWants& wants) {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  // RTC_DCHECK(thread_checker_.CalledOnValidThread());

[nisse-webrtc, 2016/04/05 10:13:46]

Should we have another rtc::ThreadChecker, bound to the worker thread?

[perkj_webrtc, 2016/04/05 11:02:37]

yes please.

[nisse-webrtc, 2016/04/05 11:43:55]

Done.

   VideoSourceBase::AddOrUpdateSink(sink, wants);
   rtc::VideoSinkWants modified_wants = wants;
   modified_wants.black_frames = !enabled();
   video_source_->AddOrUpdateSink(sink, modified_wants);
 }
 
 void VideoTrack::RemoveSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  // RTC_DCHECK(thread_checker_.CalledOnValidThread());
   VideoSourceBase::RemoveSink(sink);
   video_source_->RemoveSink(sink);
 }
 
 bool VideoTrack::set_enabled(bool enable) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   for (auto& sink_pair : sink_pairs()) {
     rtc::VideoSinkWants modified_wants = sink_pair.wants;
     modified_wants.black_frames = !enable;
+    // video_source_ is a proxy object, marshalling the call to the
+    // worker thread.

[perkj_webrtc, 2016/04/05 11:02:37]

Can you verify if this is true for remote video sources? 

[nisse-webrtc, 2016/04/05 11:43:55]

I'm looking at the VideoRtpReceiver constructor. It creates a proxy for the
VideoTrack, but not for the VideoTrackSource. I guess I should add another proxy
there, since it will be returned to the application if it calls GetSource? 

     video_source_->AddOrUpdateSink(sink_pair.sink, modified_wants);
   }
   return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable);
 }
 
 void VideoTrack::OnChanged() {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   if (video_source_->state() == MediaSourceInterface::kEnded) {
     set_state(kEnded);
   } else {
     set_state(kLive);
   }
 }
 
 rtc::scoped_refptr<VideoTrack> VideoTrack::Create(
     const std::string& id,
     VideoTrackSourceInterface* source) {
   rtc::RefCountedObject<VideoTrack>* track =
       new rtc::RefCountedObject<VideoTrack>(id, source);
   return track;
 }
 
 }  // namespace webrtc