Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/include/send_time_history.h

Issue 2086633002: Revert of Remove audio/video distinction for probe packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ 11 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_
12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ 12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_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 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 class SendTimeHistory { 22 class SendTimeHistory {
23 public: 23 public:
24 SendTimeHistory(Clock* clock, int64_t packet_age_limit); 24 SendTimeHistory(Clock* clock, int64_t packet_age_limit);
25 virtual ~SendTimeHistory(); 25 virtual ~SendTimeHistory();
26 26
27 void AddAndRemoveOld(uint16_t sequence_number, 27 void AddAndRemoveOld(uint16_t sequence_number,
28 size_t length, 28 size_t length,
29 bool was_paced,
29 int probe_cluster_id); 30 int probe_cluster_id);
30 bool OnSentPacket(uint16_t sequence_number, int64_t timestamp); 31 bool OnSentPacket(uint16_t sequence_number, int64_t timestamp);
31 // Look up PacketInfo for a sent packet, based on the sequence number, and 32 // Look up PacketInfo for a sent packet, based on the sequence number, and
32 // populate all fields except for receive_time. The packet parameter must 33 // populate all fields except for receive_time. The packet parameter must
33 // thus be non-null and have the sequence_number field set. 34 // thus be non-null and have the sequence_number field set.
34 bool GetInfo(PacketInfo* packet, bool remove); 35 bool GetInfo(PacketInfo* packet, bool remove);
35 void Clear(); 36 void Clear();
36 37
37 private: 38 private:
38 void EraseOld(); 39 void EraseOld();
39 void UpdateOldestSequenceNumber(); 40 void UpdateOldestSequenceNumber();
40 41
41 Clock* const clock_; 42 Clock* const clock_;
42 const int64_t packet_age_limit_; 43 const int64_t packet_age_limit_;
43 uint16_t oldest_sequence_number_; // Oldest may not be lowest. 44 uint16_t oldest_sequence_number_; // Oldest may not be lowest.
44 std::map<uint16_t, PacketInfo> history_; 45 std::map<uint16_t, PacketInfo> history_;
45 46
46 RTC_DISALLOW_COPY_AND_ASSIGN(SendTimeHistory); 47 RTC_DISALLOW_COPY_AND_ASSIGN(SendTimeHistory);
47 }; 48 };
48 49
49 } // namespace webrtc 50 } // namespace webrtc
50 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_ 51 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_SEND_TIME_HISTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698