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

Side by Side Diff: webrtc/video/video_capture_input.h

Issue 1487893004: Replace EventWrapper in video/, test/ and call/. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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_VIDEO_VIDEO_CAPTURE_INPUT_H_ 11 #ifndef WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
12 #define WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 12 #define WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/event.h"
17 #include "webrtc/base/platform_thread.h" 18 #include "webrtc/base/platform_thread.h"
18 #include "webrtc/base/scoped_ptr.h" 19 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/base/thread_annotations.h" 20 #include "webrtc/base/thread_annotations.h"
20 #include "webrtc/common_types.h" 21 #include "webrtc/common_types.h"
21 #include "webrtc/engine_configurations.h" 22 #include "webrtc/engine_configurations.h"
22 #include "webrtc/modules/video_capture/video_capture.h" 23 #include "webrtc/modules/video_capture/video_capture.h"
23 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 24 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
24 #include "webrtc/modules/video_coding/include/video_coding.h" 25 #include "webrtc/modules/video_coding/include/video_coding.h"
25 #include "webrtc/modules/video_processing/include/video_processing.h" 26 #include "webrtc/modules/video_processing/include/video_processing.h"
26 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 27 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
27 #include "webrtc/typedefs.h" 28 #include "webrtc/typedefs.h"
28 #include "webrtc/video_send_stream.h" 29 #include "webrtc/video_send_stream.h"
29 30
30 namespace webrtc { 31 namespace webrtc {
31 32
32 class Config; 33 class Config;
33 class CpuOveruseMetricsObserver; 34 class CpuOveruseMetricsObserver;
34 class CpuOveruseObserver; 35 class CpuOveruseObserver;
35 class CriticalSectionWrapper; 36 class CriticalSectionWrapper;
36 class EventWrapper;
37 class OveruseFrameDetector; 37 class OveruseFrameDetector;
38 class ProcessThread; 38 class ProcessThread;
39 class RegistrableCpuOveruseMetricsObserver; 39 class RegistrableCpuOveruseMetricsObserver;
40 class SendStatisticsProxy; 40 class SendStatisticsProxy;
41 class VideoRenderer; 41 class VideoRenderer;
42 42
43 class VideoCaptureCallback { 43 class VideoCaptureCallback {
44 public: 44 public:
45 virtual ~VideoCaptureCallback() {} 45 virtual ~VideoCaptureCallback() {}
46 46
(...skipping 25 matching lines...) Expand all
72 72
73 VideoCaptureCallback* const frame_callback_; 73 VideoCaptureCallback* const frame_callback_;
74 VideoRenderer* const local_renderer_; 74 VideoRenderer* const local_renderer_;
75 SendStatisticsProxy* const stats_proxy_; 75 SendStatisticsProxy* const stats_proxy_;
76 76
77 // Frame used in IncomingFrameI420. 77 // Frame used in IncomingFrameI420.
78 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_; 78 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_;
79 VideoFrame incoming_frame_; 79 VideoFrame incoming_frame_;
80 80
81 rtc::PlatformThread encoder_thread_; 81 rtc::PlatformThread encoder_thread_;
82 rtc::scoped_ptr<EventWrapper> capture_event_; 82 rtc::Event capture_event_;
83 83
84 volatile int stop_; 84 volatile int stop_;
85 85
86 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get()); 86 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get());
87 // Used to make sure incoming time stamp is increasing for every frame. 87 // Used to make sure incoming time stamp is increasing for every frame.
88 int64_t last_captured_timestamp_; 88 int64_t last_captured_timestamp_;
89 // Delta used for translating between NTP and internal timestamps. 89 // Delta used for translating between NTP and internal timestamps.
90 const int64_t delta_ntp_internal_ms_; 90 const int64_t delta_ntp_internal_ms_;
91 91
92 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 92 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
93 EncodingTimeObserver* const encoding_time_observer_; 93 EncodingTimeObserver* const encoding_time_observer_;
94 }; 94 };
95 95
96 } // namespace internal 96 } // namespace internal
97 } // namespace webrtc 97 } // namespace webrtc
98 98
99 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 99 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698