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

Side by Side Diff: webrtc/media/base/videocapturer.h

Issue 3012853002: Update thread annotiation macros to use RTC_ prefix (Closed)
Patch Set: Rebase Created 3 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 | « webrtc/media/base/videobroadcaster.h ('k') | webrtc/media/engine/fakewebrtcvideoengine.h » ('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) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 bool enable_camera_list_; 264 bool enable_camera_list_;
265 int scaled_width_; // Current output size from ComputeScale. 265 int scaled_width_; // Current output size from ComputeScale.
266 int scaled_height_; 266 int scaled_height_;
267 267
268 rtc::VideoBroadcaster broadcaster_; 268 rtc::VideoBroadcaster broadcaster_;
269 bool enable_video_adapter_; 269 bool enable_video_adapter_;
270 VideoAdapter video_adapter_; 270 VideoAdapter video_adapter_;
271 271
272 rtc::CriticalSection frame_stats_crit_; 272 rtc::CriticalSection frame_stats_crit_;
273 // The captured frame size before potential adapation. 273 // The captured frame size before potential adapation.
274 bool input_size_valid_ GUARDED_BY(frame_stats_crit_) = false; 274 bool input_size_valid_ RTC_GUARDED_BY(frame_stats_crit_) = false;
275 int input_width_ GUARDED_BY(frame_stats_crit_); 275 int input_width_ RTC_GUARDED_BY(frame_stats_crit_);
276 int input_height_ GUARDED_BY(frame_stats_crit_); 276 int input_height_ RTC_GUARDED_BY(frame_stats_crit_);
277 277
278 // Whether capturer should apply rotation to the frame before 278 // Whether capturer should apply rotation to the frame before
279 // passing it on to the registered sinks. 279 // passing it on to the registered sinks.
280 bool apply_rotation_; 280 bool apply_rotation_;
281 281
282 // State for the timestamp translation. 282 // State for the timestamp translation.
283 rtc::TimestampAligner timestamp_aligner_; 283 rtc::TimestampAligner timestamp_aligner_;
284 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 284 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
285 }; 285 };
286 286
287 } // namespace cricket 287 } // namespace cricket
288 288
289 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ 289 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/videobroadcaster.h ('k') | webrtc/media/engine/fakewebrtcvideoengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698