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 16 matching lines...) Expand all Loading... |
27 class ProcessThread; | 27 class ProcessThread; |
28 | 28 |
29 class TransportFeedbackAdapter : public TransportFeedbackObserver, | 29 class TransportFeedbackAdapter : public TransportFeedbackObserver, |
30 public CallStatsObserver { | 30 public CallStatsObserver { |
31 public: | 31 public: |
32 TransportFeedbackAdapter(Clock* clock, BitrateController* bitrate_controller); | 32 TransportFeedbackAdapter(Clock* clock, BitrateController* bitrate_controller); |
33 virtual ~TransportFeedbackAdapter(); | 33 virtual ~TransportFeedbackAdapter(); |
34 | 34 |
35 void InitBwe(); | 35 void InitBwe(); |
36 // Implements TransportFeedbackObserver. | 36 // Implements TransportFeedbackObserver. |
37 void AddPacket(uint16_t sequence_number, | 37 void AddPacket(uint32_t ssrc, |
| 38 uint16_t sequence_number, |
38 size_t length, | 39 size_t length, |
39 int probe_cluster_id) override; | 40 int probe_cluster_id) override; |
40 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); | 41 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); |
41 | 42 |
42 // TODO(holmer): This method should return DelayBasedBwe::Result so that we | 43 // TODO(holmer): This method should return DelayBasedBwe::Result so that we |
43 // can get rid of the dependency on BitrateController. Requires changes | 44 // can get rid of the dependency on BitrateController. Requires changes |
44 // to the CongestionController interface. | 45 // to the CongestionController interface. |
45 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; | 46 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; |
46 std::vector<PacketInfo> GetTransportFeedbackVector() const override; | 47 std::vector<PacketInfo> GetTransportFeedbackVector() const override; |
47 | 48 |
48 // Implements CallStatsObserver. | 49 // Implements CallStatsObserver. |
49 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; | 50 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; |
50 | 51 |
51 void SetStartBitrate(int start_bitrate_bps); | 52 void SetStartBitrate(int start_bitrate_bps); |
52 void SetMinBitrate(int min_bitrate_bps); | 53 void SetMinBitrate(int min_bitrate_bps); |
53 void SetTransportOverhead(int transport_overhead_bytes_per_packet); | 54 void SetTransportOverhead(int transport_overhead_bytes_per_packet); |
54 | 55 |
55 int64_t GetProbingIntervalMs() const; | 56 int64_t GetProbingIntervalMs() const; |
56 | 57 |
| 58 void RegisterTransportFeedbackAdapterObserver( |
| 59 TransportFeedbackAdapterObserver* observer); |
| 60 void DeRegisterTransportFeedbackAdapterObserver( |
| 61 TransportFeedbackAdapterObserver* observer); |
| 62 |
57 private: | 63 private: |
58 std::vector<PacketInfo> GetPacketFeedbackVector( | 64 std::vector<PacketInfo> GetPacketFeedbackVector( |
59 const rtcp::TransportFeedback& feedback); | 65 const rtcp::TransportFeedback& feedback); |
60 | 66 |
61 const bool send_side_bwe_with_overhead_; | 67 const bool send_side_bwe_with_overhead_; |
62 rtc::CriticalSection lock_; | 68 rtc::CriticalSection lock_; |
63 rtc::CriticalSection bwe_lock_; | 69 rtc::CriticalSection bwe_lock_; |
| 70 rtc::CriticalSection observers_lock_; |
64 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_); | 71 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_); |
65 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); | 72 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); |
66 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(&bwe_lock_); | 73 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(&bwe_lock_); |
67 Clock* const clock_; | 74 Clock* const clock_; |
68 int64_t current_offset_ms_; | 75 int64_t current_offset_ms_; |
69 int64_t last_timestamp_us_; | 76 int64_t last_timestamp_us_; |
70 BitrateController* const bitrate_controller_; | 77 BitrateController* const bitrate_controller_; |
71 std::vector<PacketInfo> last_packet_feedback_vector_; | 78 std::vector<PacketInfo> last_packet_feedback_vector_; |
| 79 std::vector<TransportFeedbackAdapterObserver*> |
| 80 observers_ GUARDED_BY(&observers_lock_); |
72 }; | 81 }; |
73 | 82 |
74 } // namespace webrtc | 83 } // namespace webrtc |
75 | 84 |
76 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ | 85 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ |
OLD | NEW |