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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 void SetTransportFeedbackObserver( | 67 void SetTransportFeedbackObserver( |
68 TransportFeedbackObserver* feedback_observer) { | 68 TransportFeedbackObserver* feedback_observer) { |
69 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 69 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
70 rtc::CritScope lock(&crit_); | 70 rtc::CritScope lock(&crit_); |
71 feedback_observer_ = feedback_observer; | 71 feedback_observer_ = feedback_observer; |
72 } | 72 } |
73 | 73 |
74 // Implements TransportFeedbackObserver. | 74 // Implements TransportFeedbackObserver. |
75 void AddPacket(uint16_t sequence_number, | 75 void AddPacket(uint16_t sequence_number, |
76 size_t length, | 76 size_t length, |
77 bool was_paced) override { | 77 int probe_cluster_id) override { |
78 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); | 78 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); |
79 rtc::CritScope lock(&crit_); | 79 rtc::CritScope lock(&crit_); |
80 if (feedback_observer_) | 80 if (feedback_observer_) |
81 feedback_observer_->AddPacket(sequence_number, length, was_paced); | 81 feedback_observer_->AddPacket(sequence_number, length, probe_cluster_id); |
82 } | 82 } |
83 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { | 83 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { |
84 RTC_DCHECK(network_thread_.CalledOnValidThread()); | 84 RTC_DCHECK(network_thread_.CalledOnValidThread()); |
85 rtc::CritScope lock(&crit_); | 85 rtc::CritScope lock(&crit_); |
86 if (feedback_observer_) | 86 if (feedback_observer_) |
87 feedback_observer_->OnTransportFeedback(feedback); | 87 feedback_observer_->OnTransportFeedback(feedback); |
88 } | 88 } |
89 | 89 |
90 private: | 90 private: |
91 rtc::CriticalSection crit_; | 91 rtc::CriticalSection crit_; |
(...skipping 3467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3559 int64_t min_rtt = 0; | 3559 int64_t min_rtt = 0; |
3560 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3560 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3561 0) { | 3561 0) { |
3562 return 0; | 3562 return 0; |
3563 } | 3563 } |
3564 return rtt; | 3564 return rtt; |
3565 } | 3565 } |
3566 | 3566 |
3567 } // namespace voe | 3567 } // namespace voe |
3568 } // namespace webrtc | 3568 } // namespace webrtc |
OLD | NEW |