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

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

Issue 1505053002: Revert of "Create rtc::AtomicInt POD struct." (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/atomicops.h"
17 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/platform_thread.h" 17 #include "webrtc/base/platform_thread.h"
19 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
20 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
21 #include "webrtc/common_types.h" 20 #include "webrtc/common_types.h"
22 #include "webrtc/engine_configurations.h" 21 #include "webrtc/engine_configurations.h"
23 #include "webrtc/modules/video_capture/video_capture.h" 22 #include "webrtc/modules/video_capture/video_capture.h"
24 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 23 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
25 #include "webrtc/modules/video_coding/include/video_coding.h" 24 #include "webrtc/modules/video_coding/include/video_coding.h"
26 #include "webrtc/modules/video_processing/include/video_processing.h" 25 #include "webrtc/modules/video_processing/include/video_processing.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 VideoRenderer* const local_renderer_; 74 VideoRenderer* const local_renderer_;
76 SendStatisticsProxy* const stats_proxy_; 75 SendStatisticsProxy* const stats_proxy_;
77 76
78 // Frame used in IncomingFrameI420. 77 // Frame used in IncomingFrameI420.
79 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_; 78 rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_;
80 VideoFrame incoming_frame_; 79 VideoFrame incoming_frame_;
81 80
82 rtc::PlatformThread encoder_thread_; 81 rtc::PlatformThread encoder_thread_;
83 rtc::scoped_ptr<EventWrapper> capture_event_; 82 rtc::scoped_ptr<EventWrapper> capture_event_;
84 83
85 rtc::AtomicInt stop_; 84 volatile int stop_;
86 85
87 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get()); 86 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get());
88 // 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.
89 int64_t last_captured_timestamp_; 88 int64_t last_captured_timestamp_;
90 // Delta used for translating between NTP and internal timestamps. 89 // Delta used for translating between NTP and internal timestamps.
91 const int64_t delta_ntp_internal_ms_; 90 const int64_t delta_ntp_internal_ms_;
92 91
93 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 92 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
94 EncodingTimeObserver* const encoding_time_observer_; 93 EncodingTimeObserver* const encoding_time_observer_;
95 }; 94 };
96 95
97 } // namespace internal 96 } // namespace internal
98 } // namespace webrtc 97 } // namespace webrtc
99 98
100 #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