| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 void SetNetworkIds(uint16_t local_id, uint16_t remote_id); | 54 void SetNetworkIds(uint16_t local_id, uint16_t remote_id); |
| 55 | 55 |
| 56 size_t GetOutstandingBytes() const; | 56 size_t GetOutstandingBytes() const; |
| 57 | 57 |
| 58 private: | 58 private: |
| 59 std::vector<PacketFeedback> GetPacketFeedbackVector( | 59 std::vector<PacketFeedback> GetPacketFeedbackVector( |
| 60 const rtcp::TransportFeedback& feedback); | 60 const rtcp::TransportFeedback& feedback); |
| 61 | 61 |
| 62 const bool send_side_bwe_with_overhead_; | 62 const bool send_side_bwe_with_overhead_; |
| 63 rtc::CriticalSection lock_; | 63 rtc::CriticalSection lock_; |
| 64 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_); | 64 int transport_overhead_bytes_per_packet_ RTC_GUARDED_BY(&lock_); |
| 65 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); | 65 SendTimeHistory send_time_history_ RTC_GUARDED_BY(&lock_); |
| 66 const Clock* const clock_; | 66 const Clock* const clock_; |
| 67 int64_t current_offset_ms_; | 67 int64_t current_offset_ms_; |
| 68 int64_t last_timestamp_us_; | 68 int64_t last_timestamp_us_; |
| 69 std::vector<PacketFeedback> last_packet_feedback_vector_; | 69 std::vector<PacketFeedback> last_packet_feedback_vector_; |
| 70 uint16_t local_net_id_ GUARDED_BY(&lock_); | 70 uint16_t local_net_id_ RTC_GUARDED_BY(&lock_); |
| 71 uint16_t remote_net_id_ GUARDED_BY(&lock_); | 71 uint16_t remote_net_id_ RTC_GUARDED_BY(&lock_); |
| 72 std::deque<int64_t> feedback_rtts_ GUARDED_BY(&lock_); | 72 std::deque<int64_t> feedback_rtts_ RTC_GUARDED_BY(&lock_); |
| 73 rtc::Optional<int64_t> min_feedback_rtt_ GUARDED_BY(&lock_); | 73 rtc::Optional<int64_t> min_feedback_rtt_ RTC_GUARDED_BY(&lock_); |
| 74 | 74 |
| 75 rtc::CriticalSection observers_lock_; | 75 rtc::CriticalSection observers_lock_; |
| 76 std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_); | 76 std::vector<PacketFeedbackObserver*> observers_ |
| 77 RTC_GUARDED_BY(&observers_lock_); |
| 77 }; | 78 }; |
| 78 | 79 |
| 79 } // namespace webrtc | 80 } // namespace webrtc |
| 80 | 81 |
| 81 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ | 82 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ |
| OLD | NEW |