Move sorting from TransportFeedbackAdapter to GoogCC.
BUG= none
Change-Id: Ibe1d058f6d5ed18a7cbdadaa3c053dd51533309d
Reviewed-on: https://webrtc-review.googlesource.com/c/120602
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26469}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 92b99f1..f0532f0 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 @@
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 eb2bfe9..4249e64 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<webrtc::PacketFeedback>* input) {
- std::sort(input->begin(), input->end(), PacketFeedbackComparator());
-}
PacketResult NetworkPacketFeedbackFromRtpPacketFeedback(
const webrtc::PacketFeedback& pf) {
@@ -143,7 +140,6 @@
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) {
