| 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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 if (feedback_observer_) | 255 if (feedback_observer_) |
| 256 feedback_observer_->AddPacket(sequence_number, length, pacing_info); | 256 feedback_observer_->AddPacket(sequence_number, length, pacing_info); |
| 257 } | 257 } |
| 258 | 258 |
| 259 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { | 259 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override { |
| 260 RTC_DCHECK(network_thread_.CalledOnValidThread()); | 260 RTC_DCHECK(network_thread_.CalledOnValidThread()); |
| 261 rtc::CritScope lock(&crit_); | 261 rtc::CritScope lock(&crit_); |
| 262 if (feedback_observer_) | 262 if (feedback_observer_) |
| 263 feedback_observer_->OnTransportFeedback(feedback); | 263 feedback_observer_->OnTransportFeedback(feedback); |
| 264 } | 264 } |
| 265 std::vector<PacketInfo> GetTransportFeedbackVector() const override { | 265 std::vector<PacketFeedback> GetTransportFeedbackVector() const override { |
| 266 RTC_NOTREACHED(); | 266 RTC_NOTREACHED(); |
| 267 return std::vector<PacketInfo>(); | 267 return std::vector<PacketFeedback>(); |
| 268 } | 268 } |
| 269 | 269 |
| 270 private: | 270 private: |
| 271 rtc::CriticalSection crit_; | 271 rtc::CriticalSection crit_; |
| 272 rtc::ThreadChecker thread_checker_; | 272 rtc::ThreadChecker thread_checker_; |
| 273 rtc::ThreadChecker pacer_thread_; | 273 rtc::ThreadChecker pacer_thread_; |
| 274 rtc::ThreadChecker network_thread_; | 274 rtc::ThreadChecker network_thread_; |
| 275 TransportFeedbackObserver* feedback_observer_ GUARDED_BY(&crit_); | 275 TransportFeedbackObserver* feedback_observer_ GUARDED_BY(&crit_); |
| 276 }; | 276 }; |
| 277 | 277 |
| (...skipping 2786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3064 int64_t min_rtt = 0; | 3064 int64_t min_rtt = 0; |
| 3065 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3065 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
| 3066 0) { | 3066 0) { |
| 3067 return 0; | 3067 return 0; |
| 3068 } | 3068 } |
| 3069 return rtt; | 3069 return rtt; |
| 3070 } | 3070 } |
| 3071 | 3071 |
| 3072 } // namespace voe | 3072 } // namespace voe |
| 3073 } // namespace webrtc | 3073 } // namespace webrtc |
| OLD | NEW |