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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « webrtc/pc/trackmediainfomap_unittest.cc ('k') | webrtc/pc/videotrack.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 #ifndef WEBRTC_PC_VIDEOTRACK_H_ 11 #ifndef WEBRTC_PC_VIDEOTRACK_H_
12 #define WEBRTC_PC_VIDEOTRACK_H_ 12 #define WEBRTC_PC_VIDEOTRACK_H_
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/scoped_ref_ptr.h" 17 #include "webrtc/base/scoped_ref_ptr.h"
18 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/media/base/videosourcebase.h" 19 #include "webrtc/media/base/videosourcebase.h"
20 #include "webrtc/pc/mediastreamtrack.h" 20 #include "webrtc/pc/mediastreamtrack.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 class VideoTrack : public MediaStreamTrack<VideoTrackInterface>, 24 class VideoTrack : public MediaStreamTrack<VideoTrackInterface>,
25 public rtc::VideoSourceBase, 25 public rtc::VideoSourceBase,
26 public ObserverInterface { 26 public ObserverInterface {
27 public: 27 public:
28 static rtc::scoped_refptr<VideoTrack> Create( 28 static rtc::scoped_refptr<VideoTrack> Create(
29 const std::string& label, 29 const std::string& label,
30 VideoTrackSourceInterface* source, 30 VideoTrackSourceInterface* source);
31 rtc::Thread* worker_thread);
32 31
33 void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink, 32 void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
34 const rtc::VideoSinkWants& wants) override; 33 const rtc::VideoSinkWants& wants) override;
35 void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override; 34 void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
36 35
37 VideoTrackSourceInterface* GetSource() const override { 36 VideoTrackSourceInterface* GetSource() const override {
38 return video_source_.get(); 37 return video_source_.get();
39 } 38 }
40 ContentHint content_hint() const override; 39 ContentHint content_hint() const override;
41 void set_content_hint(ContentHint hint) override; 40 void set_content_hint(ContentHint hint) override;
42 bool set_enabled(bool enable) override; 41 bool set_enabled(bool enable) override;
43 std::string kind() const override; 42 std::string kind() const override;
44 43
45 protected: 44 protected:
46 VideoTrack(const std::string& id, 45 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
47 VideoTrackSourceInterface* video_source,
48 rtc::Thread* worker_thread);
49 ~VideoTrack(); 46 ~VideoTrack();
50 47
51 private: 48 private:
52 // Implements ObserverInterface. Observes |video_source_| state. 49 // Implements ObserverInterface. Observes |video_source_| state.
53 void OnChanged() override; 50 void OnChanged() override;
54 51
55 rtc::Thread* const worker_thread_;
56 rtc::ThreadChecker signaling_thread_checker_; 52 rtc::ThreadChecker signaling_thread_checker_;
53 rtc::ThreadChecker worker_thread_checker_;
57 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_; 54 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
58 ContentHint content_hint_ GUARDED_BY(signaling_thread_checker_); 55 ContentHint content_hint_ GUARDED_BY(signaling_thread_checker_);
59 }; 56 };
60 57
61 } // namespace webrtc 58 } // namespace webrtc
62 59
63 #endif // WEBRTC_PC_VIDEOTRACK_H_ 60 #endif // WEBRTC_PC_VIDEOTRACK_H_
OLDNEW
« 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