| Index: webrtc/modules/congestion_controller/delay_based_bwe.cc
|
| diff --git a/webrtc/modules/congestion_controller/delay_based_bwe.cc b/webrtc/modules/congestion_controller/delay_based_bwe.cc
|
| index 3a9537ee3e6275b382ee27a786b04db72ac4f3a9..27cbf015d85f6f84fa5c9a547ff80b146fd7a3b9 100644
|
| --- a/webrtc/modules/congestion_controller/delay_based_bwe.cc
|
| +++ b/webrtc/modules/congestion_controller/delay_based_bwe.cc
|
| @@ -198,14 +198,15 @@
|
| for (const auto& packet_info : packet_feedback_vector) {
|
| IncomingPacketInfo(packet_info.arrival_time_ms,
|
| ConvertMsTo24Bits(packet_info.send_time_ms),
|
| - packet_info.payload_size, 0,
|
| + packet_info.payload_size, 0, packet_info.was_paced,
|
| packet_info.probe_cluster_id);
|
| }
|
| }
|
|
|
| void DelayBasedBwe::IncomingPacket(int64_t arrival_time_ms,
|
| size_t payload_size,
|
| - const RTPHeader& header) {
|
| + const RTPHeader& header,
|
| + bool was_paced) {
|
| RTC_DCHECK(network_thread_.CalledOnValidThread());
|
| if (!header.extension.hasAbsoluteSendTime) {
|
| // NOTE! The BitrateEstimatorTest relies on this EXACT log line.
|
| @@ -214,12 +215,14 @@
|
| return;
|
| }
|
| IncomingPacketInfo(arrival_time_ms, header.extension.absoluteSendTime,
|
| - payload_size, header.ssrc, PacketInfo::kNotAProbe);
|
| + payload_size, header.ssrc, was_paced,
|
| + PacketInfo::kNotAProbe);
|
| }
|
|
|
| void DelayBasedBwe::IncomingPacket(int64_t arrival_time_ms,
|
| size_t payload_size,
|
| const RTPHeader& header,
|
| + bool was_paced,
|
| int probe_cluster_id) {
|
| RTC_DCHECK(network_thread_.CalledOnValidThread());
|
| if (!header.extension.hasAbsoluteSendTime) {
|
| @@ -229,13 +232,14 @@
|
| return;
|
| }
|
| IncomingPacketInfo(arrival_time_ms, header.extension.absoluteSendTime,
|
| - payload_size, header.ssrc, probe_cluster_id);
|
| + payload_size, header.ssrc, was_paced, probe_cluster_id);
|
| }
|
|
|
| void DelayBasedBwe::IncomingPacketInfo(int64_t arrival_time_ms,
|
| uint32_t send_time_24bits,
|
| size_t payload_size,
|
| uint32_t ssrc,
|
| + bool was_paced,
|
| int probe_cluster_id) {
|
| assert(send_time_24bits < (1ul << 24));
|
| // Shift up send time to use the full 32 bits that inter_arrival works with,
|
|
|