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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 void SetTransportFeedbackObserver( | 245 void SetTransportFeedbackObserver( |
246 TransportFeedbackObserver* feedback_observer) { | 246 TransportFeedbackObserver* feedback_observer) { |
247 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 247 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
248 rtc::CritScope lock(&crit_); | 248 rtc::CritScope lock(&crit_); |
249 feedback_observer_ = feedback_observer; | 249 feedback_observer_ = feedback_observer; |
250 } | 250 } |
251 | 251 |
252 // Implements TransportFeedbackObserver. | 252 // Implements TransportFeedbackObserver. |
253 void AddPacket(uint32_t ssrc, | 253 void AddPacket(uint32_t ssrc, |
254 uint16_t sequence_number, | 254 uint16_t sequence_number, |
255 size_t length, | 255 size_t payload_size, |
| 256 size_t rtp_overheads_size, |
256 const PacedPacketInfo& pacing_info) override { | 257 const PacedPacketInfo& pacing_info) override { |
257 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); | 258 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); |
258 rtc::CritScope lock(&crit_); | 259 rtc::CritScope lock(&crit_); |
259 if (feedback_observer_) | 260 if (feedback_observer_) |
260 feedback_observer_->AddPacket(ssrc, sequence_number, length, pacing_info); | 261 feedback_observer_->AddPacket(ssrc, sequence_number, payload_size, |
| 262 rtp_overheads_size, pacing_info); |
261 } | 263 } |
262 | 264 |
263 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { | 265 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { |
264 RTC_DCHECK(network_thread_.CalledOnValidThread()); | 266 RTC_DCHECK(network_thread_.CalledOnValidThread()); |
265 rtc::CritScope lock(&crit_); | 267 rtc::CritScope lock(&crit_); |
266 if (feedback_observer_) | 268 if (feedback_observer_) |
267 feedback_observer_->OnTransportFeedback(feedback); | 269 feedback_observer_->OnTransportFeedback(feedback); |
268 } | 270 } |
269 std::vector<PacketFeedback> GetTransportFeedbackVector() const override { | 271 std::vector<PacketFeedback> GetTransportFeedbackVector() const override { |
270 RTC_NOTREACHED(); | 272 RTC_NOTREACHED(); |
(...skipping 2837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3108 int64_t min_rtt = 0; | 3110 int64_t min_rtt = 0; |
3109 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3111 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3110 0) { | 3112 0) { |
3111 return 0; | 3113 return 0; |
3112 } | 3114 } |
3113 return rtt; | 3115 return rtt; |
3114 } | 3116 } |
3115 | 3117 |
3116 } // namespace voe | 3118 } // namespace voe |
3117 } // namespace webrtc | 3119 } // namespace webrtc |
OLD | NEW |