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

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

Issue 2749563002: Change FrameBuffer::Stop to not require a critical section. (Closed)
Patch Set: Add comment and link to bug Created 3 years, 9 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 EXCLUSIVE_LOCKS_REQUIRED(crit_); 142 EXCLUSIVE_LOCKS_REQUIRED(crit_);
143 143
144 void UpdateJitterDelay() EXCLUSIVE_LOCKS_REQUIRED(crit_); 144 void UpdateJitterDelay() EXCLUSIVE_LOCKS_REQUIRED(crit_);
145 145
146 void ClearFramesAndHistory() EXCLUSIVE_LOCKS_REQUIRED(crit_); 146 void ClearFramesAndHistory() EXCLUSIVE_LOCKS_REQUIRED(crit_);
147 147
148 FrameMap frames_ GUARDED_BY(crit_); 148 FrameMap frames_ GUARDED_BY(crit_);
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_continuous_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 FrameMap::iterator next_frame_it_ GUARDED_BY(crit_);
160 int num_frames_history_ GUARDED_BY(crit_); 160 int num_frames_history_ GUARDED_BY(crit_);
161 int num_frames_buffered_ GUARDED_BY(crit_); 161 int num_frames_buffered_ GUARDED_BY(crit_);
162 bool stopped_ GUARDED_BY(crit_); 162 volatile int stopped_;
163 VCMVideoProtection protection_mode_ GUARDED_BY(crit_); 163 VCMVideoProtection protection_mode_ GUARDED_BY(crit_);
164 VCMReceiveStatisticsCallback* const stats_callback_; 164 VCMReceiveStatisticsCallback* const stats_callback_;
165 165
166 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer); 166 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer);
167 }; 167 };
168 168
169 } // namespace video_coding 169 } // namespace video_coding
170 } // namespace webrtc 170 } // namespace webrtc
171 171
172 #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER2_H_ 172 #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