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

Side by Side Diff: webrtc/api/videotrack.h

Issue 2471783002: Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Created 4 years, 1 month 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/api/videosourceproxy.h ('k') | webrtc/api/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
(...skipping 11 matching lines...) Expand all
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 31
32 void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink, 32 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
33 const rtc::VideoSinkWants& wants) override; 33 const rtc::VideoSinkWants& wants) override;
34 void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override; 34 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
35 35
36 VideoTrackSourceInterface* GetSource() const override { 36 VideoTrackSourceInterface* GetSource() const override {
37 return video_source_.get(); 37 return video_source_.get();
38 } 38 }
39 bool set_enabled(bool enable) override; 39 bool set_enabled(bool enable) override;
40 std::string kind() const override; 40 std::string kind() const override;
41 41
42 protected: 42 protected:
43 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source); 43 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
44 ~VideoTrack(); 44 ~VideoTrack();
45 45
46 private: 46 private:
47 // Implements ObserverInterface. Observes |video_source_| state. 47 // Implements ObserverInterface. Observes |video_source_| state.
48 void OnChanged() override; 48 void OnChanged() override;
49 49
50 rtc::ThreadChecker signaling_thread_checker_; 50 rtc::ThreadChecker signaling_thread_checker_;
51 rtc::ThreadChecker worker_thread_checker_; 51 rtc::ThreadChecker worker_thread_checker_;
52 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_; 52 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
53 }; 53 };
54 54
55 } // namespace webrtc 55 } // namespace webrtc
56 56
57 #endif // WEBRTC_API_VIDEOTRACK_H_ 57 #endif // WEBRTC_API_VIDEOTRACK_H_
OLDNEW
« no previous file with comments | « webrtc/api/videosourceproxy.h ('k') | webrtc/api/videotrack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698