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

Side by Side Diff: webrtc/media/base/videoadapter.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/adaptedvideotracksource.h ('k') | webrtc/media/base/videobroadcaster.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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 int frames_in_; // Number of input frames. 69 int frames_in_; // Number of input frames.
70 int frames_out_; // Number of output frames. 70 int frames_out_; // Number of output frames.
71 int frames_scaled_; // Number of frames scaled. 71 int frames_scaled_; // Number of frames scaled.
72 int adaption_changes_; // Number of changes in scale factor. 72 int adaption_changes_; // Number of changes in scale factor.
73 int previous_width_; // Previous adapter output width. 73 int previous_width_; // Previous adapter output width.
74 int previous_height_; // Previous adapter output height. 74 int previous_height_; // Previous adapter output height.
75 // Resolution must be divisible by this factor. 75 // Resolution must be divisible by this factor.
76 const int required_resolution_alignment_; 76 const int required_resolution_alignment_;
77 // The target timestamp for the next frame based on requested format. 77 // The target timestamp for the next frame based on requested format.
78 rtc::Optional<int64_t> next_frame_timestamp_ns_ GUARDED_BY(critical_section_); 78 rtc::Optional<int64_t> next_frame_timestamp_ns_
79 RTC_GUARDED_BY(critical_section_);
79 80
80 // Max number of pixels requested via calls to OnOutputFormatRequest, 81 // Max number of pixels requested via calls to OnOutputFormatRequest,
81 // OnResolutionRequest respectively. 82 // OnResolutionRequest respectively.
82 // The adapted output format is the minimum of these. 83 // The adapted output format is the minimum of these.
83 rtc::Optional<VideoFormat> requested_format_ GUARDED_BY(critical_section_); 84 rtc::Optional<VideoFormat> requested_format_
84 int resolution_request_target_pixel_count_ GUARDED_BY(critical_section_); 85 RTC_GUARDED_BY(critical_section_);
85 int resolution_request_max_pixel_count_ GUARDED_BY(critical_section_); 86 int resolution_request_target_pixel_count_ RTC_GUARDED_BY(critical_section_);
86 int max_framerate_request_ GUARDED_BY(critical_section_); 87 int resolution_request_max_pixel_count_ RTC_GUARDED_BY(critical_section_);
88 int max_framerate_request_ RTC_GUARDED_BY(critical_section_);
87 89
88 // The critical section to protect the above variables. 90 // The critical section to protect the above variables.
89 rtc::CriticalSection critical_section_; 91 rtc::CriticalSection critical_section_;
90 92
91 RTC_DISALLOW_COPY_AND_ASSIGN(VideoAdapter); 93 RTC_DISALLOW_COPY_AND_ASSIGN(VideoAdapter);
92 }; 94 };
93 95
94 } // namespace cricket 96 } // namespace cricket
95 97
96 #endif // WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ 98 #endif // WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/adaptedvideotracksource.h ('k') | webrtc/media/base/videobroadcaster.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698