admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move sorting from TransportFeedbackAdapter to GoogCC.

Browse Source 
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}
This commit is contained in:
Per Kjellander 2019-01-30 14:04:51 +01:00 committed by Commit Bot
parent 9f3a44f515
commit 338bfab0e6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/congestion_controller/goog_cc/goog_cc_network_control.cc
View File

@ -71,6 +71,8 @@ std::vector<PacketFeedback> ReceivedPacketsFeedbackAsRtp(
packet_feedback_vector.push_back(pf); packet_feedback_vector.push_back(pf);
} }
} }
std::sort(packet_feedback_vector.begin(), packet_feedback_vector.end(),
PacketFeedbackComparator());
return packet_feedback_vector; return packet_feedback_vector;
} }

4
modules/congestion_controller/rtp/transport_feedback_adapter.cc
View File

@ -22,9 +22,6 @@
namespace webrtc { namespace webrtc {
namespace { namespace {
void SortPacketFeedbackVector(std::vector<webrtc::PacketFeedback>* input) {
std::sort(input->begin(), input->end(), PacketFeedbackComparator());
}
PacketResult NetworkPacketFeedbackFromRtpPacketFeedback( PacketResult NetworkPacketFeedbackFromRtpPacketFeedback(
const webrtc::PacketFeedback& pf) { const webrtc::PacketFeedback& pf) {
@ -143,7 +140,6 @@ TransportFeedbackAdapter::ProcessTransportFeedback(
if (feedback_vector.empty()) if (feedback_vector.empty())
return absl::nullopt; return absl::nullopt;
SortPacketFeedbackVector(&feedback_vector);
TransportPacketsFeedback msg; TransportPacketsFeedback msg;
for (const PacketFeedback& rtp_feedback : feedback_vector) { for (const PacketFeedback& rtp_feedback : feedback_vector) {
if (rtp_feedback.send_time_ms != PacketFeedback::kNoSendTime) { if (rtp_feedback.send_time_ms != PacketFeedback::kNoSendTime) {