| OLD | NEW |
| 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 | 10 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 _remoteSSRC = ssrc; | 165 _remoteSSRC = ssrc; |
| 166 } | 166 } |
| 167 | 167 |
| 168 uint32_t RTCPReceiver::RemoteSSRC() const { | 168 uint32_t RTCPReceiver::RemoteSSRC() const { |
| 169 rtc::CritScope lock(&_criticalSectionRTCPReceiver); | 169 rtc::CritScope lock(&_criticalSectionRTCPReceiver); |
| 170 return _remoteSSRC; | 170 return _remoteSSRC; |
| 171 } | 171 } |
| 172 | 172 |
| 173 void RTCPReceiver::SetSsrcs(uint32_t main_ssrc, | 173 void RTCPReceiver::SetSsrcs(uint32_t main_ssrc, |
| 174 const std::set<uint32_t>& registered_ssrcs) { | 174 const std::set<uint32_t>& registered_ssrcs) { |
| 175 uint32_t old_ssrc = 0; | 175 rtc::CritScope lock(&_criticalSectionRTCPReceiver); |
| 176 { | 176 main_ssrc_ = main_ssrc; |
| 177 rtc::CritScope lock(&_criticalSectionRTCPReceiver); | 177 registered_ssrcs_ = registered_ssrcs; |
| 178 old_ssrc = main_ssrc_; | |
| 179 main_ssrc_ = main_ssrc; | |
| 180 registered_ssrcs_ = registered_ssrcs; | |
| 181 } | |
| 182 { | |
| 183 if (_cbRtcpIntraFrameObserver && old_ssrc != main_ssrc) { | |
| 184 _cbRtcpIntraFrameObserver->OnLocalSsrcChanged(old_ssrc, main_ssrc); | |
| 185 } | |
| 186 } | |
| 187 } | 178 } |
| 188 | 179 |
| 189 int32_t RTCPReceiver::RTT(uint32_t remoteSSRC, | 180 int32_t RTCPReceiver::RTT(uint32_t remoteSSRC, |
| 190 int64_t* RTT, | 181 int64_t* RTT, |
| 191 int64_t* avgRTT, | 182 int64_t* avgRTT, |
| 192 int64_t* minRTT, | 183 int64_t* minRTT, |
| 193 int64_t* maxRTT) const { | 184 int64_t* maxRTT) const { |
| 194 rtc::CritScope lock(&_criticalSectionRTCPReceiver); | 185 rtc::CritScope lock(&_criticalSectionRTCPReceiver); |
| 195 | 186 |
| 196 RTCPReportBlockInformation* reportBlock = | 187 RTCPReportBlockInformation* reportBlock = |
| (...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1131 } else { | 1122 } else { |
| 1132 candidates.push_back(it->second.tmmbr_item); | 1123 candidates.push_back(it->second.tmmbr_item); |
| 1133 ++it; | 1124 ++it; |
| 1134 } | 1125 } |
| 1135 } | 1126 } |
| 1136 } | 1127 } |
| 1137 return candidates; | 1128 return candidates; |
| 1138 } | 1129 } |
| 1139 | 1130 |
| 1140 } // namespace webrtc | 1131 } // namespace webrtc |
| OLD | NEW |