webrtc_m130/sdk/android/src/jni/androidhistogram.cc
Artem Titarenko e5e36ddc40 Roll chromium_revision 3546854f59..2e285ebae2 (612694:613019) + fix JNI
This changelist is based on Chromium autoroller CL
https://webrtc-review.googlesource.com/c/src/+/112847
with additional JNI fixes needed to propagate upstream changes
introduced in
c99e905516


Change log: 3546854f59..2e285ebae2
Full diff: 3546854f59..2e285ebae2

Changed dependencies
* src/base: 0551460b2b..62febbdbd7
* src/build: 59f4bb0792..8b1ff06550
* src/ios: 0c78d113b3..2c8e8f83db
* src/testing: d387a4a97a..da3cc6c84a
* src/third_party: e31ab38349..a862efe9b4
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/1b98245e3c..6f862e54f2
* src/third_party/depot_tools: 016601cc21..0b287c5bca
* src/third_party/r8: uM1IGlYVeBYwmhwRCSMVqRvmu4YFlL7M2yLwZ1DWUvAC..ndmKWh0vZhDc2iLXEETOuWXVfafHbqwI_FcSgJJIfpoC
* src/tools: 476768d37c..cc443eb2fd
DEPS diff: 3546854f59..2e285ebae2/DEPS

No update to Clang.

No-Try: True
Bug: chromium:898660
Change-Id: I8be89e16d9639d96fc09f053e29414381a486846
Reviewed-on: https://webrtc-review.googlesource.com/c/112595
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Artem Titarenko <artit@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25900}
2018-12-05 09:48:51 +00:00

51 lines
1.7 KiB
C++

/*
* Copyright 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.
*/
#include <map>
#include <memory>
#include "sdk/android/generated_base_jni/jni/Histogram_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "system_wrappers/include/metrics.h"
// Enables collection of native histograms and creating them.
namespace webrtc {
namespace jni {
static jlong JNI_Histogram_CreateCounts(JNIEnv* jni,
const JavaParamRef<jstring>& j_name,
jint min,
jint max,
jint buckets) {
std::string name = JavaToStdString(jni, j_name);
return jlongFromPointer(
metrics::HistogramFactoryGetCounts(name, min, max, buckets));
}
static jlong JNI_Histogram_CreateEnumeration(
JNIEnv* jni,
const JavaParamRef<jstring>& j_name,
jint max) {
std::string name = JavaToStdString(jni, j_name);
return jlongFromPointer(metrics::HistogramFactoryGetEnumeration(name, max));
}
static void JNI_Histogram_AddSample(JNIEnv* jni,
jlong histogram,
jint sample) {
if (histogram) {
HistogramAdd(reinterpret_cast<metrics::Histogram*>(histogram), sample);
}
}
} // namespace jni
} // namespace webrtc