Adding metrics to AEC3

webrtc/modules/audio_processing/aec3/echo_remover_metrics.h

Index: webrtc/modules/audio_processing/aec3/echo_remover_metrics.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h b/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h
new file mode 100644
index 0000000000000000000000000000000000000000..92f34f36b513b51fe181a28acd36212d870dc3a9
--- /dev/null
+++ b/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h
@@ -0,0 +1,83 @@
+/*
+ *  Copyright (c) 2017 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_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
+#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
+
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/modules/audio_processing/aec3/aec_state.h"
+
+namespace webrtc {
+
+// Handles the reporting of metrics for the echo remover.
+class EchoRemoverMetrics {
+ public:
+  struct DbMetric {
+    DbMetric();
+    DbMetric(float sum_value, float floor_value, float ceil_value);
+    void Update(float value);
+    void FormatForReporting(bool negate,
+                            float min_value,
+                            float max_value,
+                            float offset,
+                            float scaling);
+
+    float sum_value;
+    float floor_value;
+    float ceil_value;
+  };
+
+  EchoRemoverMetrics();
+
+  // Updates the metric with new data.
+  void Update(
+      const AecState& aec_state,
+      const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
+      const std::array<float, kFftLengthBy2Plus1>& suppressor_gain);
+
+  // Returns true if the metrics has just been reported, otherwise false.

[hlundin-webrtc, 2017/02/28 10:04:23]

has -> have

[peah-webrtc, 2017/02/28 12:57:26]

Done.

+  bool MetricsReported() { return metric_reported_; }
+
+ private:
+  // Resets the metrics.
+  void ResetMetrics();
+
+  int block_counter_ = 0;
+  std::array<DbMetric, 2> erl_;
+  std::array<DbMetric, 2> erle_;
+  std::array<DbMetric, 2> comfort_noise_;
+  std::array<DbMetric, 2> suppressor_gain_;
+  int active_render_ = 0;
+  bool saturated_capture_ = false;
+  bool metric_reported_ = false;

[hlundin-webrtc, 2017/02/28 10:04:23]

metrics_reported_

[peah-webrtc, 2017/02/28 12:57:26]

Done.

+
+  RTC_DISALLOW_COPY_AND_ASSIGN(EchoRemoverMetrics);
+};
+
+namespace aec3 {
+
+// Updates a banded metric of type DbMetric with the values in the supplied
+// array.
+void UpdateDbMetric(const std::array<float, kFftLengthBy2Plus1>& value,
+                    std::array<EchoRemoverMetrics::DbMetric, 2>* statistic);
+
+// Transforms a DbMetric from the linear domain into the logarithmic domain.
+void TransformDbMetricForReporting(bool negate,
+                                   float min_value,
+                                   float max_value,
+                                   float offset,
+                                   float scaleing,
+                                   float* value);
+
+}  // namespace aec3
+
+}  // namespace webrtc
+
+#endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_