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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
43 // can get rid of the dependency on BitrateController. Requires changes | 43 // can get rid of the dependency on BitrateController. Requires changes |
44 // to the CongestionController interface. | 44 // to the CongestionController interface. |
45 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; | 45 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; |
46 std::vector<PacketInfo> GetTransportFeedbackVector() const override; | 46 std::vector<PacketInfo> GetTransportFeedbackVector() const override; |
47 | 47 |
48 // Implements CallStatsObserver. | 48 // Implements CallStatsObserver. |
49 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; | 49 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; |
50 | 50 |
51 void SetMinBitrate(int min_bitrate_bps); | 51 void SetMinBitrate(int min_bitrate_bps); |
52 | 52 |
53 int GetProbingIntervalMs() const; | |
the sun
2016/11/23 09:12:34
Other methods here appear to use int64_t for milli
michaelt
2016/11/23 12:28:29
Changed the type from GetProbingIntervalMs form in
| |
54 | |
53 private: | 55 private: |
54 std::vector<PacketInfo> GetPacketFeedbackVector( | 56 std::vector<PacketInfo> GetPacketFeedbackVector( |
55 const rtcp::TransportFeedback& feedback); | 57 const rtcp::TransportFeedback& feedback); |
56 | 58 |
57 rtc::CriticalSection lock_; | 59 rtc::CriticalSection lock_; |
58 rtc::CriticalSection bwe_lock_; | 60 rtc::CriticalSection bwe_lock_; |
59 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); | 61 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); |
60 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(&bwe_lock_); | 62 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(&bwe_lock_); |
61 Clock* const clock_; | 63 Clock* const clock_; |
62 int64_t current_offset_ms_; | 64 int64_t current_offset_ms_; |
63 int64_t last_timestamp_us_; | 65 int64_t last_timestamp_us_; |
64 BitrateController* const bitrate_controller_; | 66 BitrateController* const bitrate_controller_; |
65 std::vector<PacketInfo> last_packet_feedback_vector_; | 67 std::vector<PacketInfo> last_packet_feedback_vector_; |
66 }; | 68 }; |
67 | 69 |
68 } // namespace webrtc | 70 } // namespace webrtc |
69 | 71 |
70 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ | 72 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ |
OLD | NEW |