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

Side by Side Diff: webrtc/media/base/videobroadcaster.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/media/base/fakevideorenderer.h ('k') | webrtc/media/base/videobroadcaster.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 (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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_MEDIA_BASE_VIDEOBROADCASTER_H_ 11 #ifndef WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
12 #define WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ 12 #define WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
13 13
14 #include <utility> 14 #include <utility>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/media/base/videoframe.h" 19 #include "webrtc/media/base/videoframe.h"
20 #include "webrtc/media/base/videosinkinterface.h" 20 #include "webrtc/media/base/videosinkinterface.h"
21 #include "webrtc/media/base/videosourceinterface.h" 21 #include "webrtc/media/base/videosourcebase.h"
22 #include "webrtc/media/engine/webrtcvideoframe.h"
22 23
23 namespace rtc { 24 namespace rtc {
24 25
25 // VideoBroadcaster broadcast video frames to sinks and combines 26 // VideoBroadcaster broadcast video frames to sinks and combines
26 // VideoSinkWants from its sinks. It does that by implementing 27 // VideoSinkWants from its sinks. It does that by implementing
27 // rtc::VideoSourceInterface and rtc::VideoSinkInterface. 28 // rtc::VideoSourceInterface and rtc::VideoSinkInterface.
28 // Sinks must be added and removed on one and only one thread. 29 // Sinks must be added and removed on one and only one thread.
29 // Video frames can be broadcasted on any thread. I.e VideoBroadcaster::OnFrame 30 // Video frames can be broadcasted on any thread. I.e VideoBroadcaster::OnFrame
30 // can be called on any thread. 31 // can be called on any thread.
31 class VideoBroadcaster : public VideoSourceInterface<cricket::VideoFrame>, 32 class VideoBroadcaster : public VideoSourceBase,
32 public VideoSinkInterface<cricket::VideoFrame> { 33 public VideoSinkInterface<cricket::VideoFrame> {
33 public: 34 public:
34 VideoBroadcaster(); 35 VideoBroadcaster();
35 void AddOrUpdateSink(VideoSinkInterface<cricket::VideoFrame>* sink, 36 void AddOrUpdateSink(VideoSinkInterface<cricket::VideoFrame>* sink,
36 const VideoSinkWants& wants) override; 37 const VideoSinkWants& wants) override;
37 void RemoveSink(VideoSinkInterface<cricket::VideoFrame>* sink) override; 38 void RemoveSink(VideoSinkInterface<cricket::VideoFrame>* sink) override;
38 39
39 // Returns true if the next frame will be delivered to at least one sink. 40 // Returns true if the next frame will be delivered to at least one sink.
40 bool frame_wanted() const; 41 bool frame_wanted() const;
41 42
42 // Returns VideoSinkWants a source is requested to fulfill. They are 43 // Returns VideoSinkWants a source is requested to fulfill. They are
43 // aggregated by all VideoSinkWants from all sinks. 44 // aggregated by all VideoSinkWants from all sinks.
44 VideoSinkWants wants() const; 45 VideoSinkWants wants() const;
45 46
46 void OnFrame(const cricket::VideoFrame& frame) override; 47 void OnFrame(const cricket::VideoFrame& frame) override;
47 48
48 protected: 49 protected:
49 struct SinkPair { 50 void UpdateWants() EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
50 SinkPair(VideoSinkInterface<cricket::VideoFrame>* sink, 51 const cricket::VideoFrame& GetBlackFrame(const cricket::VideoFrame& frame)
51 VideoSinkWants wants)
52 : sink(sink), wants(wants) {}
53 VideoSinkInterface<cricket::VideoFrame>* sink;
54 VideoSinkWants wants;
55 };
56 SinkPair* FindSinkPair(const VideoSinkInterface<cricket::VideoFrame>* sink)
57 EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_); 52 EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
58 void UpdateWants() EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
59 53
60 ThreadChecker thread_checker_; 54 ThreadChecker thread_checker_;
61 rtc::CriticalSection sinks_and_wants_lock_; 55 rtc::CriticalSection sinks_and_wants_lock_;
62 56
63 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_); 57 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_);
64 std::vector<SinkPair> sinks_ GUARDED_BY(sinks_and_wants_lock_); 58 rtc::scoped_ptr<cricket::WebRtcVideoFrame> black_frame_;
65 }; 59 };
66 60
67 } // namespace rtc 61 } // namespace rtc
68 62
69 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ 63 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/fakevideorenderer.h ('k') | webrtc/media/base/videobroadcaster.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698