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

Side by Side Diff: webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

Issue 3010223002: Update thread annotiation macros in modules to use RTC_ prefix (Closed)
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 std::map<int, RtpUtility::Payload> payload_type_map_; 119 std::map<int, RtpUtility::Payload> payload_type_map_;
120 int8_t incoming_payload_type_; 120 int8_t incoming_payload_type_;
121 int8_t last_received_payload_type_; 121 int8_t last_received_payload_type_;
122 int8_t last_received_media_payload_type_; 122 int8_t last_received_media_payload_type_;
123 bool rtx_; 123 bool rtx_;
124 // Mapping rtx_payload_type_map_[rtx] = associated. 124 // Mapping rtx_payload_type_map_[rtx] = associated.
125 std::map<int, int> rtx_payload_type_map_; 125 std::map<int, int> rtx_payload_type_map_;
126 uint32_t ssrc_rtx_; 126 uint32_t ssrc_rtx_;
127 // Only warn once per payload type, if an RTX packet is received but 127 // Only warn once per payload type, if an RTX packet is received but
128 // no associated payload type found in |rtx_payload_type_map_|. 128 // no associated payload type found in |rtx_payload_type_map_|.
129 std::set<int> payload_types_with_suppressed_warnings_ GUARDED_BY(crit_sect_); 129 std::set<int> payload_types_with_suppressed_warnings_
130 RTC_GUARDED_BY(crit_sect_);
130 131
131 // As a first step in splitting this class up in separate cases for audio and 132 // As a first step in splitting this class up in separate cases for audio and
132 // video, DCHECK that no instance is used for both audio and video. 133 // video, DCHECK that no instance is used for both audio and video.
133 #if RTC_DCHECK_IS_ON 134 #if RTC_DCHECK_IS_ON
134 bool used_for_audio_ GUARDED_BY(crit_sect_) = false; 135 bool used_for_audio_ RTC_GUARDED_BY(crit_sect_) = false;
135 bool used_for_video_ GUARDED_BY(crit_sect_) = false; 136 bool used_for_video_ RTC_GUARDED_BY(crit_sect_) = false;
136 #endif 137 #endif
137 }; 138 };
138 139
139 } // namespace webrtc 140 } // namespace webrtc
140 141
141 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ 142 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/flexfec_receiver.h ('k') | webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698