Revert "Revert of Propagate probing cluster id to SendTimeHistory. (patchset #5 id:80001 of https://codereview.webrtc.org/2005313003/ )"
This reverts commit 46948c17fd09e4957bebc8ea61f0a8e77ff84b48.
TBR=mflodman@webrtc.org
BUG=webrtc:5859
Review-Url: https://codereview.webrtc.org/2032473002
Cr-Commit-Position: refs/heads/master@{#12992}
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 2a9220d..bd36a52 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -428,17 +428,19 @@
bool ModuleRtpRtcpImpl::TimeToSendPacket(uint32_t ssrc,
uint16_t sequence_number,
int64_t capture_time_ms,
- bool retransmission) {
+ bool retransmission,
+ int probe_cluster_id) {
if (SendingMedia() && ssrc == rtp_sender_.SSRC()) {
- return rtp_sender_.TimeToSendPacket(
- sequence_number, capture_time_ms, retransmission);
+ return rtp_sender_.TimeToSendPacket(sequence_number, capture_time_ms,
+ retransmission, probe_cluster_id);
}
// No RTP sender is interested in sending this packet.
return true;
}
-size_t ModuleRtpRtcpImpl::TimeToSendPadding(size_t bytes) {
- return rtp_sender_.TimeToSendPadding(bytes);
+size_t ModuleRtpRtcpImpl::TimeToSendPadding(size_t bytes,
+ int probe_cluster_id) {
+ return rtp_sender_.TimeToSendPadding(bytes, probe_cluster_id);
}
uint16_t ModuleRtpRtcpImpl::MaxPayloadLength() const {
