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

Side by Side Diff: webrtc/video/encoder_rtcp_feedback.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/video/call_stats.h ('k') | webrtc/video/end_to_end_tests.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) 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 #ifndef WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_ 10 #ifndef WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_
(...skipping 19 matching lines...) Expand all
30 30
31 private: 31 private:
32 bool HasSsrc(uint32_t ssrc); 32 bool HasSsrc(uint32_t ssrc);
33 size_t GetStreamIndex(uint32_t ssrc); 33 size_t GetStreamIndex(uint32_t ssrc);
34 34
35 Clock* const clock_; 35 Clock* const clock_;
36 const std::vector<uint32_t> ssrcs_; 36 const std::vector<uint32_t> ssrcs_;
37 VideoStreamEncoder* const video_stream_encoder_; 37 VideoStreamEncoder* const video_stream_encoder_;
38 38
39 rtc::CriticalSection crit_; 39 rtc::CriticalSection crit_;
40 std::vector<int64_t> time_last_intra_request_ms_ GUARDED_BY(crit_); 40 std::vector<int64_t> time_last_intra_request_ms_ RTC_GUARDED_BY(crit_);
41 }; 41 };
42 42
43 } // namespace webrtc 43 } // namespace webrtc
44 44
45 #endif // WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_ 45 #endif // WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_
OLDNEW
« no previous file with comments | « webrtc/video/call_stats.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698