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 19 matching lines...) Expand all Loading... |
30 class TransportFeedbackAdapter { | 30 class TransportFeedbackAdapter { |
31 public: | 31 public: |
32 explicit TransportFeedbackAdapter(const Clock* clock); | 32 explicit TransportFeedbackAdapter(const Clock* clock); |
33 virtual ~TransportFeedbackAdapter(); | 33 virtual ~TransportFeedbackAdapter(); |
34 | 34 |
35 void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); | 35 void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); |
36 void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); | 36 void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); |
37 | 37 |
38 void AddPacket(uint32_t ssrc, | 38 void AddPacket(uint32_t ssrc, |
39 uint16_t sequence_number, | 39 uint16_t sequence_number, |
40 size_t length, | 40 size_t payload_size, |
| 41 size_t rtp_headers_size, |
41 const PacedPacketInfo& pacing_info); | 42 const PacedPacketInfo& pacing_info); |
42 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); | 43 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); |
43 | 44 |
44 // TODO(holmer): This method should return DelayBasedBwe::Result so that we | 45 // TODO(holmer): This method should return DelayBasedBwe::Result so that we |
45 // can get rid of the dependency on BitrateController. Requires changes | 46 // can get rid of the dependency on BitrateController. Requires changes |
46 // to the CongestionController interface. | 47 // to the CongestionController interface. |
47 void OnTransportFeedback(const rtcp::TransportFeedback& feedback); | 48 void OnTransportFeedback(const rtcp::TransportFeedback& feedback); |
48 std::vector<PacketFeedback> GetTransportFeedbackVector() const; | 49 std::vector<PacketFeedback> GetTransportFeedbackVector() const; |
49 | 50 |
50 void SetTransportOverhead(int transport_overhead_bytes_per_packet); | 51 void SetTransportOverhead(int transport_overhead_bytes_per_packet); |
51 | 52 |
52 void SetNetworkIds(uint16_t local_id, uint16_t remote_id); | 53 void SetNetworkIds(uint16_t local_id, uint16_t remote_id); |
53 | 54 |
54 private: | 55 private: |
55 std::vector<PacketFeedback> GetPacketFeedbackVector( | 56 std::vector<PacketFeedback> GetPacketFeedbackVector( |
56 const rtcp::TransportFeedback& feedback); | 57 const rtcp::TransportFeedback& feedback); |
57 | 58 |
58 const bool send_side_bwe_with_overhead_; | |
59 rtc::CriticalSection lock_; | 59 rtc::CriticalSection lock_; |
60 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_); | 60 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_); |
61 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); | 61 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); |
62 const Clock* const clock_; | 62 const Clock* const clock_; |
63 int64_t current_offset_ms_; | 63 int64_t current_offset_ms_; |
64 int64_t last_timestamp_us_; | 64 int64_t last_timestamp_us_; |
65 std::vector<PacketFeedback> last_packet_feedback_vector_; | 65 std::vector<PacketFeedback> last_packet_feedback_vector_; |
66 uint16_t local_net_id_ GUARDED_BY(&lock_); | 66 uint16_t local_net_id_ GUARDED_BY(&lock_); |
67 uint16_t remote_net_id_ GUARDED_BY(&lock_); | 67 uint16_t remote_net_id_ GUARDED_BY(&lock_); |
68 | 68 |
69 rtc::CriticalSection observers_lock_; | 69 rtc::CriticalSection observers_lock_; |
70 std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_); | 70 std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_); |
71 }; | 71 }; |
72 | 72 |
73 } // namespace webrtc | 73 } // namespace webrtc |
74 | 74 |
75 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ | 75 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ |
OLD | NEW |