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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 size_t length, | 162 size_t length, |
163 int probe_cluster_id) override { | 163 int probe_cluster_id) override { |
164 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); | 164 RTC_DCHECK(pacer_thread_.CalledOnValidThread()); |
165 rtc::CritScope lock(&crit_); | 165 rtc::CritScope lock(&crit_); |
166 if (feedback_observer_) | 166 if (feedback_observer_) |
167 feedback_observer_->AddPacket(sequence_number, length, probe_cluster_id); | 167 feedback_observer_->AddPacket(sequence_number, length, probe_cluster_id); |
168 } | 168 } |
169 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { | 169 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { |
170 RTC_DCHECK(network_thread_.CalledOnValidThread()); | 170 RTC_DCHECK(network_thread_.CalledOnValidThread()); |
171 rtc::CritScope lock(&crit_); | 171 rtc::CritScope lock(&crit_); |
172 if (feedback_observer_) | 172 feedback_observer_->OnTransportFeedback(feedback); |
173 feedback_observer_->OnTransportFeedback(feedback); | 173 } |
| 174 std::vector<PacketInfo> GetTransportFeedbackVector() const override { |
| 175 RTC_NOTREACHED(); |
| 176 return std::vector<PacketInfo>(); |
174 } | 177 } |
175 | 178 |
176 private: | 179 private: |
177 rtc::CriticalSection crit_; | 180 rtc::CriticalSection crit_; |
178 rtc::ThreadChecker thread_checker_; | 181 rtc::ThreadChecker thread_checker_; |
179 rtc::ThreadChecker pacer_thread_; | 182 rtc::ThreadChecker pacer_thread_; |
180 rtc::ThreadChecker network_thread_; | 183 rtc::ThreadChecker network_thread_; |
181 TransportFeedbackObserver* feedback_observer_ GUARDED_BY(&crit_); | 184 TransportFeedbackObserver* feedback_observer_ GUARDED_BY(&crit_); |
182 }; | 185 }; |
183 | 186 |
(...skipping 3302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3486 int64_t min_rtt = 0; | 3489 int64_t min_rtt = 0; |
3487 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3490 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3488 0) { | 3491 0) { |
3489 return 0; | 3492 return 0; |
3490 } | 3493 } |
3491 return rtt; | 3494 return rtt; |
3492 } | 3495 } |
3493 | 3496 |
3494 } // namespace voe | 3497 } // namespace voe |
3495 } // namespace webrtc | 3498 } // namespace webrtc |
OLD | NEW |