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

Unified Diff: webrtc/pc/videotrack.h

Issue 2979493003: Revert: Change VideoTrack implementation to invoke VideoTrackSourceInterface::AddOrUpdateSink on wt (Closed)
Patch Set: Created 3 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/trackmediainfomap_unittest.cc ('k') | webrtc/pc/videotrack.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/videotrack.h
diff --git a/webrtc/pc/videotrack.h b/webrtc/pc/videotrack.h
index 659ac9e335697243c78cebbb3249c33583a5bec9..7e75e14d07eef30f779fd878fcaa01b0c1d8c6ea 100644
--- a/webrtc/pc/videotrack.h
+++ b/webrtc/pc/videotrack.h
@@ -27,8 +27,7 @@
public:
static rtc::scoped_refptr<VideoTrack> Create(
const std::string& label,
- VideoTrackSourceInterface* source,
- rtc::Thread* worker_thread);
+ VideoTrackSourceInterface* source);
void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
const rtc::VideoSinkWants& wants) override;
@@ -43,17 +42,15 @@
std::string kind() const override;
protected:
- VideoTrack(const std::string& id,
- VideoTrackSourceInterface* video_source,
- rtc::Thread* worker_thread);
+ VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
~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_);
};
« no previous file with comments | « webrtc/pc/trackmediainfomap_unittest.cc ('k') | webrtc/pc/videotrack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698