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 15 matching lines...) Expand all Loading... |
26 | 26 |
27 class TransportFeedbackAdapter : public TransportFeedbackObserver, | 27 class TransportFeedbackAdapter : public TransportFeedbackObserver, |
28 public CallStatsObserver, | 28 public CallStatsObserver, |
29 public RemoteBitrateObserver { | 29 public RemoteBitrateObserver { |
30 public: | 30 public: |
31 TransportFeedbackAdapter(RtcpBandwidthObserver* bandwidth_observer, | 31 TransportFeedbackAdapter(RtcpBandwidthObserver* bandwidth_observer, |
32 Clock* clock, | 32 Clock* clock, |
33 ProcessThread* process_thread); | 33 ProcessThread* process_thread); |
34 virtual ~TransportFeedbackAdapter(); | 34 virtual ~TransportFeedbackAdapter(); |
35 | 35 |
36 void OnSentPacket(const PacketInfo& info) override; | 36 void AddPacket(uint16_t sequence_number, |
| 37 size_t length, |
| 38 bool was_paced) override; |
37 | 39 |
38 void UpdateSendTime(uint16_t sequence_number, int64_t send_time_ms); | 40 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); |
39 | 41 |
40 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; | 42 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; |
41 | 43 |
42 void SetBitrateEstimator(RemoteBitrateEstimator* rbe); | 44 void SetBitrateEstimator(RemoteBitrateEstimator* rbe); |
43 | 45 |
44 RemoteBitrateEstimator* GetBitrateEstimator() const { | 46 RemoteBitrateEstimator* GetBitrateEstimator() const { |
45 return bitrate_estimator_.get(); | 47 return bitrate_estimator_.get(); |
46 } | 48 } |
47 | 49 |
48 private: | 50 private: |
49 void OnReceiveBitrateChanged(const std::vector<unsigned int>& ssrcs, | 51 void OnReceiveBitrateChanged(const std::vector<unsigned int>& ssrcs, |
50 unsigned int bitrate) override; | 52 unsigned int bitrate) override; |
51 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; | 53 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; |
52 | 54 |
53 rtc::CriticalSection lock_; | 55 rtc::CriticalSection lock_; |
54 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); | 56 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); |
55 rtc::scoped_ptr<RtcpBandwidthObserver> rtcp_bandwidth_observer_; | 57 rtc::scoped_ptr<RtcpBandwidthObserver> rtcp_bandwidth_observer_; |
56 rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_; | 58 rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_; |
57 ProcessThread* const process_thread_; | 59 ProcessThread* const process_thread_; |
58 Clock* const clock_; | 60 Clock* const clock_; |
59 int64_t current_offset_ms_; | 61 int64_t current_offset_ms_; |
60 int64_t last_timestamp_us_; | 62 int64_t last_timestamp_us_; |
61 }; | 63 }; |
62 | 64 |
63 } // namespace webrtc | 65 } // namespace webrtc |
64 | 66 |
65 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_ | 67 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_ |
OLD | NEW |