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

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: Removed unused code. 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
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"
20 22
21 namespace webrtc { 23 namespace webrtc {
22 24
23 class VideoTrack : public MediaStreamTrack<VideoTrackInterface> { 25 class VideoTrack : public MediaStreamTrack<VideoTrackInterface> {
24 public: 26 public:
25 static rtc::scoped_refptr<VideoTrack> Create( 27 static rtc::scoped_refptr<VideoTrack> Create(
26 const std::string& label, 28 const std::string& label,
27 VideoTrackSourceInterface* source); 29 VideoTrackSourceInterface* source);
28 30
29 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink, 31 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
30 const rtc::VideoSinkWants& wants) override; 32 const rtc::VideoSinkWants& wants) override;
31 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 33 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
32 34
33 virtual VideoTrackSourceInterface* GetSource() const { 35 virtual VideoTrackSourceInterface* GetSource() const {
34 return video_source_.get(); 36 return video_source_.get();
35 } 37 }
36 virtual bool set_enabled(bool enable); 38 virtual bool set_enabled(bool enable);
37 virtual std::string kind() const; 39 virtual std::string kind() const;
38 40
39 protected: 41 protected:
40 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source); 42 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
41 ~VideoTrack(); 43 ~VideoTrack();
42 44
43 private: 45 private:
44 VideoTrackRenderers renderers_; 46 struct SinkPair {
47 SinkPair(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
48 rtc::VideoSinkWants wants)
49 : sink(sink), wants(wants) {}
50 rtc::VideoSinkInterface<cricket::VideoFrame>* sink;
51 rtc::VideoSinkWants wants;
52 };
53 SinkPair* FindSinkPair(
54 const rtc::VideoSinkInterface<cricket::VideoFrame>* sink);
55
56 rtc::ThreadChecker thread_checker_;
57 std::vector<SinkPair> sinks_;
58
45 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_; 59 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
46 }; 60 };
47 61
48 } // namespace webrtc 62 } // namespace webrtc
49 63
50 #endif // WEBRTC_API_VIDEOTRACK_H_ 64 #endif // WEBRTC_API_VIDEOTRACK_H_
OLDNEW
« no previous file with comments | « webrtc/api/api.gyp ('k') | webrtc/api/videotrack.cc » ('j') | webrtc/api/videotrack.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698