From 338bfab0e673b25903e9ea0012b748a85266fc3d Mon Sep 17 00:00:00 2001 From: Per Kjellander Date: Wed, 30 Jan 2019 14:04:51 +0100 Subject: [PATCH] Move sorting from TransportFeedbackAdapter to GoogCC. BUG= none Change-Id: Ibe1d058f6d5ed18a7cbdadaa3c053dd51533309d Reviewed-on: https://webrtc-review.googlesource.com/c/120602 Commit-Queue: Sebastian Jansson Reviewed-by: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#26469} --- .../congestion_controller/goog_cc/goog_cc_network_control.cc | 2 ++ .../congestion_controller/rtp/transport_feedback_adapter.cc | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index 92b99f1c46..f0532f0ae7 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -71,6 +71,8 @@ std::vector ReceivedPacketsFeedbackAsRtp( packet_feedback_vector.push_back(pf); } } + std::sort(packet_feedback_vector.begin(), packet_feedback_vector.end(), + PacketFeedbackComparator()); return packet_feedback_vector; } diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.cc b/modules/congestion_controller/rtp/transport_feedback_adapter.cc index eb2bfe9b35..4249e64841 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter.cc +++ b/modules/congestion_controller/rtp/transport_feedback_adapter.cc @@ -22,9 +22,6 @@ namespace webrtc { namespace { -void SortPacketFeedbackVector(std::vector* input) { - std::sort(input->begin(), input->end(), PacketFeedbackComparator()); -} PacketResult NetworkPacketFeedbackFromRtpPacketFeedback( const webrtc::PacketFeedback& pf) { @@ -143,7 +140,6 @@ TransportFeedbackAdapter::ProcessTransportFeedback( if (feedback_vector.empty()) return absl::nullopt; - SortPacketFeedbackVector(&feedback_vector); TransportPacketsFeedback msg; for (const PacketFeedback& rtp_feedback : feedback_vector) { if (rtp_feedback.send_time_ms != PacketFeedback::kNoSendTime) {