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 |
11 #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_TIME_HISTORY_H_ | 11 #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_TIME_HISTORY_H_ |
12 #define WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_TIME_HISTORY_H_ | 12 #define WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_TIME_HISTORY_H_ |
13 | 13 |
14 #include <map> | 14 #include <map> |
15 | 15 |
16 #include "webrtc/base/constructormagic.h" | 16 #include "webrtc/base/constructormagic.h" |
17 #include "webrtc/base/basictypes.h" | 17 #include "webrtc/base/basictypes.h" |
18 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" | |
18 | 19 |
19 namespace webrtc { | 20 namespace webrtc { |
20 | 21 |
21 class SendTimeHistory { | 22 class SendTimeHistory { |
22 public: | 23 public: |
23 explicit SendTimeHistory(int64_t packet_age_limit); | 24 explicit SendTimeHistory(int64_t packet_age_limit); |
24 virtual ~SendTimeHistory(); | 25 virtual ~SendTimeHistory(); |
25 | 26 |
26 void AddAndRemoveOldSendTimes(uint16_t sequence_number, int64_t timestamp); | 27 void AddAndRemoveOld(const PacketInfo& packet); |
27 bool GetSendTime(uint16_t sequence_number, int64_t* timestamp, bool remove); | 28 bool UpdateSendTime(uint16_t sequence_number, int64_t timestamp); |
29 bool Populate(PacketInfo* packet, bool remove); | |
stefan-webrtc
2015/09/03 11:30:32
GetPacketInfo would be better I think. Populate co
sprang_webrtc
2015/09/03 13:24:09
Updated, and added a comment about expected input/
| |
28 void Clear(); | 30 void Clear(); |
29 | 31 |
30 private: | 32 private: |
31 void EraseOld(int64_t limit); | 33 void EraseOld(int64_t limit); |
32 void UpdateOldestSequenceNumber(); | 34 void UpdateOldestSequenceNumber(); |
33 | 35 |
34 const int64_t packet_age_limit_; | 36 const int64_t packet_age_limit_; |
35 uint16_t oldest_sequence_number_; // Oldest may not be lowest. | 37 uint16_t oldest_sequence_number_; // Oldest may not be lowest. |
36 std::map<uint16_t, int64_t> history_; | 38 std::map<uint16_t, PacketInfo> history_; |
37 | 39 |
38 DISALLOW_COPY_AND_ASSIGN(SendTimeHistory); | 40 DISALLOW_COPY_AND_ASSIGN(SendTimeHistory); |
39 }; | 41 }; |
40 | 42 |
41 } // namespace webrtc | 43 } // namespace webrtc |
42 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_TIME_HISTORY_H_ | 44 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_SEND_TIME_HISTORY_H_ |
OLD | NEW |