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

Side by Side Diff: webrtc/media/base/videobroadcaster.h

Issue 2517173004: Move VideoFrame and related declarations to webrtc/api/video. (Closed)
Patch Set: Make rotation check clearer. Created 3 years, 11 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/testutils.cc ('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 <memory> 14 #include <memory>
15 #include <utility> 15 #include <utility>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/api/video/video_frame.h"
18 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/thread_checker.h" 20 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/media/base/videosinkinterface.h" 21 #include "webrtc/media/base/videosinkinterface.h"
21 #include "webrtc/media/base/videosourcebase.h" 22 #include "webrtc/media/base/videosourcebase.h"
22 #include "webrtc/video_frame.h"
23 23
24 namespace rtc { 24 namespace rtc {
25 25
26 // VideoBroadcaster broadcast video frames to sinks and combines 26 // VideoBroadcaster broadcast video frames to sinks and combines
27 // VideoSinkWants from its sinks. It does that by implementing 27 // VideoSinkWants from its sinks. It does that by implementing
28 // rtc::VideoSourceInterface and rtc::VideoSinkInterface. 28 // rtc::VideoSourceInterface and rtc::VideoSinkInterface.
29 // 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.
30 // 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
31 // can be called on any thread. 31 // can be called on any thread.
32 class VideoBroadcaster : public VideoSourceBase, 32 class VideoBroadcaster : public VideoSourceBase,
(...skipping 26 matching lines...) Expand all
59 ThreadChecker thread_checker_; 59 ThreadChecker thread_checker_;
60 rtc::CriticalSection sinks_and_wants_lock_; 60 rtc::CriticalSection sinks_and_wants_lock_;
61 61
62 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_); 62 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_);
63 rtc::scoped_refptr<webrtc::VideoFrameBuffer> black_frame_buffer_; 63 rtc::scoped_refptr<webrtc::VideoFrameBuffer> black_frame_buffer_;
64 }; 64 };
65 65
66 } // namespace rtc 66 } // namespace rtc
67 67
68 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ 68 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/testutils.cc ('k') | webrtc/media/base/videobroadcaster.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698