Chromium Code Reviews

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

Issue 1332383002: Rename CaptureThread to EncodingThread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: EncoderThreadFunction Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« 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 44 matching lines...)
55 VideoCaptureCallback* frame_callback, 55 VideoCaptureCallback* frame_callback,
56 VideoRenderer* local_renderer, 56 VideoRenderer* local_renderer,
57 SendStatisticsProxy* send_stats_proxy, 57 SendStatisticsProxy* send_stats_proxy,
58 CpuOveruseObserver* overuse_observer); 58 CpuOveruseObserver* overuse_observer);
59 ~VideoCaptureInput(); 59 ~VideoCaptureInput();
60 60
61 void IncomingCapturedFrame(const VideoFrame& video_frame) override; 61 void IncomingCapturedFrame(const VideoFrame& video_frame) override;
62 62
63 private: 63 private:
64 // Thread functions for deliver captured frames to receivers. 64 // Thread functions for deliver captured frames to receivers.
65 static bool CaptureThreadFunction(void* obj); 65 static bool EncoderThreadFunction(void* obj);
66 bool CaptureProcess(); 66 bool EncoderProcess();
67 67
68 void DeliverI420Frame(VideoFrame* video_frame); 68 void DeliverI420Frame(VideoFrame* video_frame);
69 69
70 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_; 70 rtc::scoped_ptr<CriticalSectionWrapper> capture_cs_;
71 ProcessThread* const module_process_thread_; 71 ProcessThread* const module_process_thread_;
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 // Capture thread. 81 rtc::scoped_ptr<ThreadWrapper> encoder_thread_;
82 rtc::scoped_ptr<ThreadWrapper> capture_thread_; 82 rtc::scoped_ptr<EventWrapper> capture_event_;
83 // TODO(pbos): scoped_ptr
84 EventWrapper& capture_event_;
85 83
86 volatile int stop_; 84 volatile int stop_;
87 85
88 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get()); 86 VideoFrame captured_frame_ GUARDED_BY(capture_cs_.get());
89 // 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.
90 int64_t last_captured_timestamp_; 88 int64_t last_captured_timestamp_;
91 // Delta used for translating between NTP and internal timestamps. 89 // Delta used for translating between NTP and internal timestamps.
92 const int64_t delta_ntp_internal_ms_; 90 const int64_t delta_ntp_internal_ms_;
93 91
94 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_; 92 rtc::scoped_ptr<OveruseFrameDetector> overuse_detector_;
95 }; 93 };
96 94
97 } // namespace internal 95 } // namespace internal
98 } // namespace webrtc 96 } // namespace webrtc
99 97
100 #endif // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_ 98 #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