Refactored incoming bitrate estimator.

webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h

Index: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index 183755eff3928817546e5929662493716b2c05c6..90537c3e30fbc35357a4dece49f5accd848b5081 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -347,6 +347,17 @@ struct PacketFeedback {
   PacedPacketInfo pacing_info;
 };
 
+class PacketFeedbackComparator {

[terelius, 2017/06/05 14:52:51]

Could this be reused in analyzer.cc too?

[tschumi, 2017/06/05 15:13:54]

Done.

+ public:
+  inline bool operator()(const PacketFeedback& lhs, const PacketFeedback& rhs) {
+    if (lhs.arrival_time_ms != rhs.arrival_time_ms)
+      return lhs.arrival_time_ms < rhs.arrival_time_ms;
+    if (lhs.send_time_ms != rhs.send_time_ms)
+      return lhs.send_time_ms < rhs.send_time_ms;
+    return lhs.sequence_number < rhs.sequence_number;
+  }
+};
+
 class TransportFeedbackObserver {
  public:
   TransportFeedbackObserver() {}