Merge changes I7bbf776e,I1b827825

am: fe8b4a6579

* commit 'fe8b4a657979b49e1701bd92f6d5814a99e0b2be': (7237 commits)
  WIP: Changes after merge commit 'cb3f9bd'
  Make the nonlinear beamformer steerable
  Utilize bitrate above codec max to protect video.
  Enable VP9 internal resize by default.
  Filter overlapping RTP header extensions.
  Make VCMEncodedFrameCallback const.
  MediaCodecVideoEncoder: Add number of quality resolution downscales to Encoded callback.
  Remove redudant encoder rate calls.
  Create isolate files for nonparallel tests.
  Register header extensions in RtpRtcpObserver to avoid log spam.
  Make an enum class out of NetEqDecoder, and hide the neteq_decoders_ table
  ACM: Move NACK functionality inside NetEq
  Fix chromium-style warnings in webrtc/sound/.
  Create a 'webrtc_nonparallel_tests' target.
  Update scalability structure data according to updates in the RTP payload profile.
  audio_coding: rename interface -> include
  Rewrote perform_action_on_all_files to be parallell.
  Update reference indices according to updates in the RTP payload profile.
  Disable P2PTransport...TestFailoverControlledSide on Memcheck
  pass clangcl compile options to ignore warnings in gflags.cc
  ...

1 files changed, 82 insertions, 0 deletions

diff --git a/webrtc/test/histogram.cc b/webrtc/test/histogram.cc
new file mode 100644
index 0000000000..6fcdb6864f
--- /dev/null
+++ b/webrtc/test/histogram.cc
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2015 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.
+ */
+
+#include "webrtc/test/histogram.h"
+
+#include <map>
+
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/thread_annotations.h"
+#include "webrtc/system_wrappers/include/metrics.h"
+
+// Test implementation of histogram methods in
+// webrtc/system_wrappers/include/metrics.h.
+
+namespace webrtc {
+namespace {
+struct SampleInfo {
+  SampleInfo(int sample)
+      : last(sample), total(1) {}
+  int last;   // Last added sample.
+  int total;  // Total number of added samples.
+};
+
+rtc::CriticalSection histogram_crit_;
+// Map holding info about added samples to a histogram (mapped by the histogram
+// name).
+std::map<std::string, SampleInfo> histograms_ GUARDED_BY(histogram_crit_);
+}  // namespace
+
+namespace metrics {
+Histogram* HistogramFactoryGetCounts(const std::string& name, int min, int max,
+    int bucket_count) { return NULL; }
+
+Histogram* HistogramFactoryGetEnumeration(const std::string& name,
+    int boundary) { return NULL; }
+
+void HistogramAdd(
+    Histogram* histogram_pointer, const std::string& name, int sample) {
+  rtc::CritScope cs(&histogram_crit_);
+  auto it = histograms_.find(name);
+  if (it == histograms_.end()) {
+    histograms_.insert(std::make_pair(name, SampleInfo(sample)));
+    return;
+  }
+  it->second.last = sample;
+  ++it->second.total;
+}
+}  // namespace metrics
+
+namespace test {
+int LastHistogramSample(const std::string& name) {
+  rtc::CritScope cs(&histogram_crit_);
+  const auto it = histograms_.find(name);
+  if (it == histograms_.end()) {
+    return -1;
+  }
+  return it->second.last;
+}
+
+int NumHistogramSamples(const std::string& name) {
+  rtc::CritScope cs(&histogram_crit_);
+  const auto it = histograms_.find(name);
+  if (it == histograms_.end()) {
+    return 0;
+  }
+  return it->second.total;
+}
+
+void ClearHistograms() {
+  rtc::CritScope cs(&histogram_crit_);
+  histograms_.clear();
+}
+}  // namespace test
+}  // namespace webrtc
+