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

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

Issue 2668743002: Fix race condition in FrameBuffer2 (Closed)
Patch Set: Created 3 years, 10 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/modules/video_coding/frame_buffer2.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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 rtc::CriticalSection crit_; 150 rtc::CriticalSection crit_;
151 Clock* const clock_; 151 Clock* const clock_;
152 rtc::Event new_countinuous_frame_event_; 152 rtc::Event new_countinuous_frame_event_;
153 VCMJitterEstimator* const jitter_estimator_ GUARDED_BY(crit_); 153 VCMJitterEstimator* const jitter_estimator_ GUARDED_BY(crit_);
154 VCMTiming* const timing_ GUARDED_BY(crit_); 154 VCMTiming* const timing_ GUARDED_BY(crit_);
155 VCMInterFrameDelay inter_frame_delay_ GUARDED_BY(crit_); 155 VCMInterFrameDelay inter_frame_delay_ GUARDED_BY(crit_);
156 uint32_t last_decoded_frame_timestamp_ GUARDED_BY(crit_); 156 uint32_t last_decoded_frame_timestamp_ GUARDED_BY(crit_);
157 FrameMap::iterator last_decoded_frame_it_ GUARDED_BY(crit_); 157 FrameMap::iterator last_decoded_frame_it_ GUARDED_BY(crit_);
158 FrameMap::iterator last_continuous_frame_it_ GUARDED_BY(crit_); 158 FrameMap::iterator last_continuous_frame_it_ GUARDED_BY(crit_);
159 FrameMap::iterator next_frame_it_ GUARDED_BY(crit_);
159 int num_frames_history_ GUARDED_BY(crit_); 160 int num_frames_history_ GUARDED_BY(crit_);
160 int num_frames_buffered_ GUARDED_BY(crit_); 161 int num_frames_buffered_ GUARDED_BY(crit_);
161 bool stopped_ GUARDED_BY(crit_); 162 bool stopped_ GUARDED_BY(crit_);
162 VCMVideoProtection protection_mode_ GUARDED_BY(crit_); 163 VCMVideoProtection protection_mode_ GUARDED_BY(crit_);
163 164
164 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer); 165 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer);
165 166
166 // For WebRTC.Video.JitterBufferDelayInMs metric. 167 // For WebRTC.Video.JitterBufferDelayInMs metric.
167 int64_t accumulated_delay_ = 0; 168 int64_t accumulated_delay_ = 0;
168 int64_t accumulated_delay_samples_ = 0; 169 int64_t accumulated_delay_samples_ = 0;
169 170
170 // For WebRTC.Video.KeyFramesReceivedInPermille metric. 171 // For WebRTC.Video.KeyFramesReceivedInPermille metric.
171 int64_t num_total_frames_ = 0; 172 int64_t num_total_frames_ = 0;
172 int64_t num_key_frames_ = 0; 173 int64_t num_key_frames_ = 0;
173 }; 174 };
174 175
175 } // namespace video_coding 176 } // namespace video_coding
176 } // namespace webrtc 177 } // namespace webrtc
177 178
178 #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ 179 #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/frame_buffer2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698