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

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

Issue 1331833003: Remove unused event in ivideo_capture_input.cc. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | 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
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // Capture thread. 81 // Capture thread.
82 rtc::scoped_ptr<ThreadWrapper> capture_thread_; 82 rtc::scoped_ptr<ThreadWrapper> capture_thread_;
83 // TODO(pbos): scoped_ptr 83 // TODO(pbos): scoped_ptr
84 EventWrapper& capture_event_; 84 EventWrapper& capture_event_;
85 EventWrapper& deliver_event_;
86 85
87 volatile int stop_; 86 volatile int stop_;
88 87
89 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get()); 88 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get());
90 // Used to make sure incoming time stamp is increasing for every frame. 89 // Used to make sure incoming time stamp is increasing for every frame.
91 int64_t last_captured_timestamp_; 90 int64_t last_captured_timestamp_;
92 // Delta used for translating between NTP and internal timestamps. 91 // Delta used for translating between NTP and internal timestamps.
93 const int64_t delta_ntp_internal_ms_; 92 const int64_t delta_ntp_internal_ms_;
94 93
95 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 94 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
96 }; 95 };
97 96
98 } // namespace internal 97 } // namespace internal
99 } // namespace webrtc 98 } // namespace webrtc
100 99
101 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 100 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/video_capture_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698