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

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

Issue 1779063003: Refactor VideoTracks to forward all sinks to its source (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 9 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/api/api.gyp ('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
11 #ifndef WEBRTC_API_VIDEOTRACK_H_ 11 #ifndef WEBRTC_API_VIDEOTRACK_H_
12 #define WEBRTC_API_VIDEOTRACK_H_ 12 #define WEBRTC_API_VIDEOTRACK_H_
13 13
14 #include <string> 14 #include <string>
15 #include <vector>
15 16
16 #include "webrtc/api/mediastreamtrack.h" 17 #include "webrtc/api/mediastreamtrack.h"
17 #include "webrtc/api/videosourceinterface.h" 18 #include "webrtc/api/videosourceinterface.h"
18 #include "webrtc/api/videotrackrenderers.h" 19 #include "webrtc/api/videotrackrenderers.h"
19 #include "webrtc/base/scoped_ref_ptr.h" 20 #include "webrtc/base/scoped_ref_ptr.h"
21 #include "webrtc/base/thread_checker.h"
22 #include "webrtc/media/base/videosourcebase.h"
20 23
21 namespace webrtc { 24 namespace webrtc {
22 25
23 class VideoTrack : public MediaStreamTrack<VideoTrackInterface> { 26 class VideoTrack : public MediaStreamTrack<VideoTrackInterface>,
27 public rtc::VideoSourceBase {
24 public: 28 public:
25 static rtc::scoped_refptr<VideoTrack> Create( 29 static rtc::scoped_refptr<VideoTrack> Create(
26 const std::string& label, 30 const std::string& label,
27 VideoTrackSourceInterface* source); 31 VideoTrackSourceInterface* source);
28 32
29 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink, 33 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
30 const rtc::VideoSinkWants& wants) override; 34 const rtc::VideoSinkWants& wants) override;
31 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 35 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
32 36
33 virtual VideoTrackSourceInterface* GetSource() const { 37 virtual VideoTrackSourceInterface* GetSource() const {
34 return video_source_.get(); 38 return video_source_.get();
35 } 39 }
36 virtual bool set_enabled(bool enable); 40 virtual bool set_enabled(bool enable);
37 virtual std::string kind() const; 41 virtual std::string kind() const;
38 42
39 protected: 43 protected:
40 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source); 44 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
41 ~VideoTrack(); 45 ~VideoTrack();
42 46
43 private: 47 private:
44 VideoTrackRenderers renderers_; 48 rtc::ThreadChecker thread_checker_;
45 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_; 49 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
46 }; 50 };
47 51
48 } // namespace webrtc 52 } // namespace webrtc
49 53
50 #endif // WEBRTC_API_VIDEOTRACK_H_ 54 #endif // WEBRTC_API_VIDEOTRACK_H_
OLDNEW
« no previous file with comments | « webrtc/api/api.gyp ('k') | webrtc/api/videotrack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698