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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 if (feedback_observer_) | 219 if (feedback_observer_) |
220 feedback_observer_->AddPacket(sequence_number, length, pacing_info); | 220 feedback_observer_->AddPacket(sequence_number, length, pacing_info); |
221 } | 221 } |
222 | 222 |
223 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { | 223 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { |
224 RTC_DCHECK(network_thread_.CalledOnValidThread()); | 224 RTC_DCHECK(network_thread_.CalledOnValidThread()); |
225 rtc::CritScope lock(&crit_); | 225 rtc::CritScope lock(&crit_); |
226 if (feedback_observer_) | 226 if (feedback_observer_) |
227 feedback_observer_->OnTransportFeedback(feedback); | 227 feedback_observer_->OnTransportFeedback(feedback); |
228 } | 228 } |
229 std::vector<PacketInfo> GetTransportFeedbackVector() const override { | 229 std::vector<PacketFeedback> GetTransportFeedbackVector() const override { |
230 RTC_NOTREACHED(); | 230 RTC_NOTREACHED(); |
231 return std::vector<PacketInfo>(); | 231 return std::vector<PacketFeedback>(); |
232 } | 232 } |
233 | 233 |
234 private: | 234 private: |
235 rtc::CriticalSection crit_; | 235 rtc::CriticalSection crit_; |
236 rtc::ThreadChecker thread_checker_; | 236 rtc::ThreadChecker thread_checker_; |
237 rtc::ThreadChecker pacer_thread_; | 237 rtc::ThreadChecker pacer_thread_; |
238 rtc::ThreadChecker network_thread_; | 238 rtc::ThreadChecker network_thread_; |
239 TransportFeedbackObserver* feedback_observer_ GUARDED_BY(&crit_); | 239 TransportFeedbackObserver* feedback_observer_ GUARDED_BY(&crit_); |
240 }; | 240 }; |
241 | 241 |
(...skipping 2798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3040 int64_t min_rtt = 0; | 3040 int64_t min_rtt = 0; |
3041 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3041 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3042 0) { | 3042 0) { |
3043 return 0; | 3043 return 0; |
3044 } | 3044 } |
3045 return rtt; | 3045 return rtt; |
3046 } | 3046 } |
3047 | 3047 |
3048 } // namespace voe | 3048 } // namespace voe |
3049 } // namespace webrtc | 3049 } // namespace webrtc |
OLD | NEW |