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

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

Issue 1420043008: Create rtc::AtomicInt POD struct. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: intentional obliteration of the unintentional whitespace of doom Created 5 years, 1 month 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/system_wrappers/source/trace_impl.cc ('k') | webrtc/video/video_capture_input.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) 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/atomicops.h"
16 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
19 #include "webrtc/common_types.h" 20 #include "webrtc/common_types.h"
20 #include "webrtc/engine_configurations.h" 21 #include "webrtc/engine_configurations.h"
21 #include "webrtc/modules/video_capture/video_capture.h" 22 #include "webrtc/modules/video_capture/video_capture.h"
22 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" 23 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
23 #include "webrtc/modules/video_coding/main/interface/video_coding.h" 24 #include "webrtc/modules/video_coding/main/interface/video_coding.h"
24 #include "webrtc/modules/video_processing/main/interface/video_processing.h" 25 #include "webrtc/modules/video_processing/main/interface/video_processing.h"
25 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 26 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 VideoRenderer* const local_renderer_; 75 VideoRenderer* const local_renderer_;
75 SendStatisticsProxy* const stats_proxy_; 76 SendStatisticsProxy* const stats_proxy_;
76 77
77 // Frame used in IncomingFrameI420. 78 // Frame used in IncomingFrameI420.
78 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_; 79 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_;
79 VideoFrame incoming_frame_; 80 VideoFrame incoming_frame_;
80 81
81 rtc::scoped_ptr<ThreadWrapper> encoder_thread_; 82 rtc::scoped_ptr<ThreadWrapper> encoder_thread_;
82 rtc::scoped_ptr<EventWrapper> capture_event_; 83 rtc::scoped_ptr<EventWrapper> capture_event_;
83 84
84 volatile int stop_; 85 rtc::AtomicInt stop_;
85 86
86 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get()); 87 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get());
87 // Used to make sure incoming time stamp is increasing for every frame. 88 // Used to make sure incoming time stamp is increasing for every frame.
88 int64_t last_captured_timestamp_; 89 int64_t last_captured_timestamp_;
89 // Delta used for translating between NTP and internal timestamps. 90 // Delta used for translating between NTP and internal timestamps.
90 const int64_t delta_ntp_internal_ms_; 91 const int64_t delta_ntp_internal_ms_;
91 92
92 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 93 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
93 EncodingTimeObserver* const encoding_time_observer_; 94 EncodingTimeObserver* const encoding_time_observer_;
94 }; 95 };
95 96
96 } // namespace internal 97 } // namespace internal
97 } // namespace webrtc 98 } // namespace webrtc
98 99
99 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 100 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/source/trace_impl.cc ('k') | webrtc/video/video_capture_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698