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

Side by Side Diff: webrtc/modules/video_coding/media_optimization.h

Issue 2779623002: remove more CriticalSectionWrappers. (Closed)
Patch Set: rebase Created 3 years, 8 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
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 uint16_t height, 94 uint16_t height,
95 int num_temporal_layers, 95 int num_temporal_layers,
96 int32_t mtu) 96 int32_t mtu)
97 EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); 97 EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
98 98
99 uint32_t InputFrameRateInternal() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); 99 uint32_t InputFrameRateInternal() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
100 100
101 uint32_t SentFrameRateInternal() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); 101 uint32_t SentFrameRateInternal() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
102 102
103 // Protect all members. 103 // Protect all members.
104 std::unique_ptr<CriticalSectionWrapper> crit_sect_; 104 rtc::CriticalSection crit_sect_;
105 105
106 Clock* clock_ GUARDED_BY(crit_sect_); 106 Clock* clock_ GUARDED_BY(crit_sect_);
107 int32_t max_bit_rate_ GUARDED_BY(crit_sect_); 107 int32_t max_bit_rate_ GUARDED_BY(crit_sect_);
108 uint16_t codec_width_ GUARDED_BY(crit_sect_); 108 uint16_t codec_width_ GUARDED_BY(crit_sect_);
109 uint16_t codec_height_ GUARDED_BY(crit_sect_); 109 uint16_t codec_height_ GUARDED_BY(crit_sect_);
110 float user_frame_rate_ GUARDED_BY(crit_sect_); 110 float user_frame_rate_ GUARDED_BY(crit_sect_);
111 std::unique_ptr<FrameDropper> frame_dropper_ GUARDED_BY(crit_sect_); 111 std::unique_ptr<FrameDropper> frame_dropper_ GUARDED_BY(crit_sect_);
112 uint32_t send_statistics_[4] GUARDED_BY(crit_sect_); 112 uint32_t send_statistics_[4] GUARDED_BY(crit_sect_);
113 uint32_t send_statistics_zero_encode_ GUARDED_BY(crit_sect_); 113 uint32_t send_statistics_zero_encode_ GUARDED_BY(crit_sect_);
114 int32_t max_payload_size_ GUARDED_BY(crit_sect_); 114 int32_t max_payload_size_ GUARDED_BY(crit_sect_);
115 int video_target_bitrate_ GUARDED_BY(crit_sect_); 115 int video_target_bitrate_ GUARDED_BY(crit_sect_);
116 float incoming_frame_rate_ GUARDED_BY(crit_sect_); 116 float incoming_frame_rate_ GUARDED_BY(crit_sect_);
117 int64_t incoming_frame_times_[kFrameCountHistorySize] GUARDED_BY(crit_sect_); 117 int64_t incoming_frame_times_[kFrameCountHistorySize] GUARDED_BY(crit_sect_);
118 std::list<EncodedFrameSample> encoded_frame_samples_ GUARDED_BY(crit_sect_); 118 std::list<EncodedFrameSample> encoded_frame_samples_ GUARDED_BY(crit_sect_);
119 uint32_t avg_sent_bit_rate_bps_ GUARDED_BY(crit_sect_); 119 uint32_t avg_sent_bit_rate_bps_ GUARDED_BY(crit_sect_);
120 uint32_t avg_sent_framerate_ GUARDED_BY(crit_sect_); 120 uint32_t avg_sent_framerate_ GUARDED_BY(crit_sect_);
121 int num_layers_ GUARDED_BY(crit_sect_); 121 int num_layers_ GUARDED_BY(crit_sect_);
122 }; 122 };
123 } // namespace media_optimization 123 } // namespace media_optimization
124 } // namespace webrtc 124 } // namespace webrtc
125 125
126 #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ 126 #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698