New ProbingCalculator class.

webrtc/modules/congestion_controller/probing_calculator.h

Index: webrtc/modules/congestion_controller/probing_calculator.h
diff --git a/webrtc/modules/congestion_controller/probing_calculator.h b/webrtc/modules/congestion_controller/probing_calculator.h
new file mode 100644
index 0000000000000000000000000000000000000000..e6a09f7efc7b2e7db1db99fd0892e1da88bf0f5d
--- /dev/null
+++ b/webrtc/modules/congestion_controller/probing_calculator.h
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBING_CALCULATOR_H_
+#define WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBING_CALCULATOR_H_
+
+#include <map>
+#include <limits>
+
+#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+
+namespace webrtc {
+
+class ProbingResultCallback {
+ public:
+  virtual void ProbingResult(int bps, int64_t timestamp) = 0;
+  virtual ~ProbingResultCallback() {}
+};
+
+class ProbingCalculator {
+ public:
+  explicit ProbingCalculator(ProbingResultCallback* result_callback);
+
+  // Should be called for every packet we receive feedback about. If the
+  // packet was used for probing it will validate/calculate the resulting
+  // bitrate and call the |result_callback| with the new estimate.
+  void PacketFeedback(const PacketInfo& packet_info);
+
+ private:
+  struct AggregatedCluster {
+    int num_probes = 0;
+    int64_t first_send_ms = std::numeric_limits<int64_t>::max();
+    int64_t last_send_ms = 0;
+    int64_t first_receive_ms = std::numeric_limits<int64_t>::max();
+    int64_t last_receive_ms = 0;
+    float size = 0;

[brandtr, 2016/07/08 09:39:21]

Why not cast to a float where needed for the computation instead?

[philipel, 2016/07/08 10:49:17]

I guess that's cleaner, done.

+  };
+
+  std::map<int, AggregatedCluster> clusters_;
+  ProbingResultCallback* result_callback_;
+  int last_valid_cluster_id_;
+};
+
+}  // namespace webrtc
+
+#endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_PROBING_CALCULATOR_H_