| Index: webrtc/modules/congestion_controller/transport_feedback_adapter.h
|
| diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.h b/webrtc/modules/congestion_controller/transport_feedback_adapter.h
|
| index 4fe70c5dcc37043075566af3c5363555a7ffd9dd..4d4b4077ceb128587943e86aec8243d786e5d227 100644
|
| --- a/webrtc/modules/congestion_controller/transport_feedback_adapter.h
|
| +++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.h
|
| @@ -61,19 +61,20 @@ class TransportFeedbackAdapter {
|
|
|
| const bool send_side_bwe_with_overhead_;
|
| rtc::CriticalSection lock_;
|
| - int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_);
|
| - SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
|
| + int transport_overhead_bytes_per_packet_ RTC_GUARDED_BY(&lock_);
|
| + SendTimeHistory send_time_history_ RTC_GUARDED_BY(&lock_);
|
| const Clock* const clock_;
|
| int64_t current_offset_ms_;
|
| int64_t last_timestamp_us_;
|
| std::vector<PacketFeedback> last_packet_feedback_vector_;
|
| - uint16_t local_net_id_ GUARDED_BY(&lock_);
|
| - uint16_t remote_net_id_ GUARDED_BY(&lock_);
|
| - std::deque<int64_t> feedback_rtts_ GUARDED_BY(&lock_);
|
| - rtc::Optional<int64_t> min_feedback_rtt_ GUARDED_BY(&lock_);
|
| + uint16_t local_net_id_ RTC_GUARDED_BY(&lock_);
|
| + uint16_t remote_net_id_ RTC_GUARDED_BY(&lock_);
|
| + std::deque<int64_t> feedback_rtts_ RTC_GUARDED_BY(&lock_);
|
| + rtc::Optional<int64_t> min_feedback_rtt_ RTC_GUARDED_BY(&lock_);
|
|
|
| rtc::CriticalSection observers_lock_;
|
| - std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_);
|
| + std::vector<PacketFeedbackObserver*> observers_
|
| + RTC_GUARDED_BY(&observers_lock_);
|
| };
|
|
|
| } // namespace webrtc
|
|
|