Index: webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h |
diff --git a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h |
index 057dfb8e9747e57c033985a89249ce61b4176e63..f201aeb1885bc4cd137610219098da354e5c510a 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h |
+++ b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h |
@@ -19,6 +19,7 @@ |
#include "webrtc/common_types.h" |
#include "webrtc/modules/interface/module.h" |
#include "webrtc/modules/interface/module_common_types.h" |
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" |
#include "webrtc/typedefs.h" |
namespace webrtc { |
@@ -58,34 +59,9 @@ struct ReceiveBandwidthEstimatorStats { |
std::vector<int64_t> recent_arrival_time_ms; |
}; |
-struct PacketInfo { |
- PacketInfo(int64_t arrival_time_ms, |
- int64_t send_time_ms, |
- uint16_t sequence_number, |
- size_t payload_size, |
- bool was_paced) |
- : arrival_time_ms(arrival_time_ms), |
- send_time_ms(send_time_ms), |
- sequence_number(sequence_number), |
- payload_size(payload_size), |
- was_paced(was_paced) {} |
- // Time corresponding to when the packet was received. Timestamped with the |
- // receiver's clock. |
- int64_t arrival_time_ms; |
- // Time corresponding to when the packet was sent, timestamped with the |
- // sender's clock. |
- int64_t send_time_ms; |
- // Packet identifier, incremented with 1 for every packet generated by the |
- // sender. |
- uint16_t sequence_number; |
- // Size of the packet excluding RTP headers. |
- size_t payload_size; |
- // True if the packet was paced out by the pacer. |
- bool was_paced; |
-}; |
- |
class RemoteBitrateEstimator : public CallStatsObserver, public Module { |
public: |
+ static const int kDefaultMinBitrateBps = 30000; |
virtual ~RemoteBitrateEstimator() {} |
virtual void IncomingPacketFeedbackVector( |