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

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

Issue 2763323002: DCHECK that no RTPPayloadRegistry instance is used for both audio and video (Closed)
Patch Set: We ♥ locks! 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/rtp_rtcp/source/rtp_payload_registry.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) 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 int8_t incoming_payload_type_; 131 int8_t incoming_payload_type_;
132 int8_t last_received_payload_type_; 132 int8_t last_received_payload_type_;
133 int8_t last_received_media_payload_type_; 133 int8_t last_received_media_payload_type_;
134 bool rtx_; 134 bool rtx_;
135 // Mapping rtx_payload_type_map_[rtx] = associated. 135 // Mapping rtx_payload_type_map_[rtx] = associated.
136 std::map<int, int> rtx_payload_type_map_; 136 std::map<int, int> rtx_payload_type_map_;
137 uint32_t ssrc_rtx_; 137 uint32_t ssrc_rtx_;
138 // Only warn once per payload type, if an RTX packet is received but 138 // Only warn once per payload type, if an RTX packet is received but
139 // no associated payload type found in |rtx_payload_type_map_|. 139 // no associated payload type found in |rtx_payload_type_map_|.
140 std::set<int> payload_types_with_suppressed_warnings_ GUARDED_BY(crit_sect_); 140 std::set<int> payload_types_with_suppressed_warnings_ GUARDED_BY(crit_sect_);
141
142 // As a first step in splitting this class up in separate cases for audio and
143 // video, DCHECK that no instance is used for both audio and video.
144 #if RTC_DCHECK_IS_ON
145 bool used_for_audio_ GUARDED_BY(crit_sect_) = false;
146 bool used_for_video_ GUARDED_BY(crit_sect_) = false;
147 #endif
141 }; 148 };
142 149
143 } // namespace webrtc 150 } // namespace webrtc
144 151
145 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ 152 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698