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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 void SetTransportFeedbackObserver( | 205 void SetTransportFeedbackObserver( |
206 TransportFeedbackObserver* feedback_observer) { | 206 TransportFeedbackObserver* feedback_observer) { |
207 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 207 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
208 rtc::CritScope lock(&crit_); | 208 rtc::CritScope lock(&crit_); |
209 feedback_observer_ = feedback_observer; | 209 feedback_observer_ = feedback_observer; |
210 } | 210 } |
211 | 211 |
212 // Implements TransportFeedbackObserver. | 212 // Implements TransportFeedbackObserver. |
213 void AddPacket(uint16_t sequence_number, | 213 void AddPacket(uint16_t sequence_number, |
214 size_t length, | 214 size_t length, |
215 int probe_cluster_id) override { | 215 const PacedPacketInfo& pacing_info) override { |
216 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); | 216 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); |
217 rtc::CritScope lock(&crit_); | 217 rtc::CritScope lock(&crit_); |
218 if (feedback_observer_) | 218 if (feedback_observer_) |
219 feedback_observer_->AddPacket(sequence_number, length, probe_cluster_id); | 219 feedback_observer_->AddPacket(sequence_number, length, pacing_info); |
220 } | 220 } |
| 221 |
221 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { | 222 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { |
222 RTC_DCHECK(network_thread_.CalledOnValidThread()); | 223 RTC_DCHECK(network_thread_.CalledOnValidThread()); |
223 rtc::CritScope lock(&crit_); | 224 rtc::CritScope lock(&crit_); |
224 if (feedback_observer_) | 225 if (feedback_observer_) |
225 feedback_observer_->OnTransportFeedback(feedback); | 226 feedback_observer_->OnTransportFeedback(feedback); |
226 } | 227 } |
227 std::vector<PacketInfo> GetTransportFeedbackVector() const override { | 228 std::vector<PacketInfo> GetTransportFeedbackVector() const override { |
228 RTC_NOTREACHED(); | 229 RTC_NOTREACHED(); |
229 return std::vector<PacketInfo>(); | 230 return std::vector<PacketInfo>(); |
230 } | 231 } |
(...skipping 2789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3020 int64_t min_rtt = 0; | 3021 int64_t min_rtt = 0; |
3021 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3022 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3022 0) { | 3023 0) { |
3023 return 0; | 3024 return 0; |
3024 } | 3025 } |
3025 return rtt; | 3026 return rtt; |
3026 } | 3027 } |
3027 | 3028 |
3028 } // namespace voe | 3029 } // namespace voe |
3029 } // namespace webrtc | 3030 } // namespace webrtc |
OLD | NEW |