| Index: webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| index add7c21e9be22e109c15227de2b7ee0ac4336c7f..4d0f742e771a62e655b9b20c6fb9c5c2a21d613e 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| @@ -559,7 +559,7 @@ size_t RTPSender::SendPadData(size_t bytes, int probe_cluster_id) {
|
| probe_cluster_id);
|
| }
|
|
|
| - if (!SendPacketToNetwork(padding_packet, options))
|
| + if (!SendPacketToNetwork(padding_packet, options, probe_cluster_id))
|
| break;
|
|
|
| bytes_sent += padding_bytes_in_packet;
|
| @@ -612,7 +612,8 @@ int32_t RTPSender::ReSendPacket(uint16_t packet_id, int64_t min_resend_time) {
|
| }
|
|
|
| bool RTPSender::SendPacketToNetwork(const RtpPacketToSend& packet,
|
| - const PacketOptions& options) {
|
| + const PacketOptions& options,
|
| + int probe_cluster_id) {
|
| int bytes_sent = -1;
|
| if (transport_) {
|
| UpdateRtpOverhead(packet);
|
| @@ -621,7 +622,7 @@ bool RTPSender::SendPacketToNetwork(const RtpPacketToSend& packet,
|
| : -1;
|
| if (event_log_ && bytes_sent > 0) {
|
| event_log_->LogRtpHeader(kOutgoingPacket, MediaType::ANY, packet.data(),
|
| - packet.size());
|
| + packet.size(), probe_cluster_id);
|
| }
|
| }
|
| TRACE_EVENT_INSTANT2(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"),
|
| @@ -742,7 +743,7 @@ bool RTPSender::PrepareAndSendPacket(std::unique_ptr<RtpPacketToSend> packet,
|
| packet->Ssrc());
|
| }
|
|
|
| - if (!SendPacketToNetwork(*packet_to_send, options))
|
| + if (!SendPacketToNetwork(*packet_to_send, options, probe_cluster_id))
|
| return false;
|
|
|
| {
|
| @@ -871,7 +872,7 @@ bool RTPSender::SendToNetwork(std::unique_ptr<RtpPacketToSend> packet,
|
| UpdateOnSendPacket(options.packet_id, packet->capture_time_ms(),
|
| packet->Ssrc());
|
|
|
| - bool sent = SendPacketToNetwork(*packet, options);
|
| + bool sent = SendPacketToNetwork(*packet, options, PacketInfo::kNotAProbe);
|
|
|
| if (sent) {
|
| {
|
|
|