Reland of Change VideoTrack implementation to invoke VideoTrackSourceInterface::AddOrUpdateSink on …

webrtc/pc/videotrack.h

 /*
  *  Copyright 2012 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.
  */
 
 #ifndef WEBRTC_PC_VIDEOTRACK_H_
 #define WEBRTC_PC_VIDEOTRACK_H_
 
 #include <string>
 #include <vector>
 
 #include "webrtc/media/base/videosourcebase.h"
 #include "webrtc/pc/mediastreamtrack.h"
 #include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 
 class VideoTrack : public MediaStreamTrack<VideoTrackInterface>,
                    public rtc::VideoSourceBase,
                    public ObserverInterface {
  public:
   static rtc::scoped_refptr<VideoTrack> Create(
       const std::string& label,
-      VideoTrackSourceInterface* source);
+      VideoTrackSourceInterface* source,
+      rtc::Thread* worker_thread);
 
   void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
                        const rtc::VideoSinkWants& wants) override;
   void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
 
   VideoTrackSourceInterface* GetSource() const override {
     return video_source_.get();
   }
   ContentHint content_hint() const override;
   void set_content_hint(ContentHint hint) override;
   bool set_enabled(bool enable) override;
   std::string kind() const override;
 
  protected:
-  VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
+  VideoTrack(const std::string& id,
+             VideoTrackSourceInterface* video_source,
+             rtc::Thread* worker_thread);
   ~VideoTrack();
 
  private:
   // Implements ObserverInterface. Observes |video_source_| state.
   void OnChanged() override;
 
+  rtc::Thread* const worker_thread_;
   rtc::ThreadChecker signaling_thread_checker_;
-  rtc::ThreadChecker worker_thread_checker_;
   rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
   ContentHint content_hint_ GUARDED_BY(signaling_thread_checker_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_PC_VIDEOTRACK_H_