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

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: 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 (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/videosourceinterface.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 VideoSourceInterface<cricket::VideoFrame>,
(...skipping 17 matching lines...) Expand all
49 struct SinkPair { 50 struct SinkPair {
50 SinkPair(VideoSinkInterface<cricket::VideoFrame>* sink, 51 SinkPair(VideoSinkInterface<cricket::VideoFrame>* sink,
51 VideoSinkWants wants) 52 VideoSinkWants wants)
52 : sink(sink), wants(wants) {} 53 : sink(sink), wants(wants) {}
53 VideoSinkInterface<cricket::VideoFrame>* sink; 54 VideoSinkInterface<cricket::VideoFrame>* sink;
54 VideoSinkWants wants; 55 VideoSinkWants wants;
55 }; 56 };
56 SinkPair* FindSinkPair(const VideoSinkInterface<cricket::VideoFrame>* sink) 57 SinkPair* FindSinkPair(const VideoSinkInterface<cricket::VideoFrame>* sink)
57 EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_); 58 EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
58 void UpdateWants() EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_); 59 void UpdateWants() EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
60 const cricket::VideoFrame& GetBlackFrame(const cricket::VideoFrame& frame)
61 EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
59 62
60 ThreadChecker thread_checker_; 63 ThreadChecker thread_checker_;
61 rtc::CriticalSection sinks_and_wants_lock_; 64 rtc::CriticalSection sinks_and_wants_lock_;
62 65
63 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_); 66 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_);
64 std::vector<SinkPair> sinks_ GUARDED_BY(sinks_and_wants_lock_); 67 std::vector<SinkPair> sinks_ GUARDED_BY(sinks_and_wants_lock_);
68
69 rtc::scoped_ptr<cricket::WebRtcVideoFrame> black_frame_;
65 }; 70 };
66 71
67 } // namespace rtc 72 } // namespace rtc
68 73
69 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ 74 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698