From 2c9fc2c1a197b84ba9ef3dc4e586a77a18c3dcc5 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 2 Apr 2019 14:00:37 +0300 Subject: Say hello to Qt Android Sensors based on NDK API Until Qt 5.9, we had to use JNI way because the NDK sensors API was introduced in API-16. Starting with Qt 5.9 we can safely use the NDK API as API_16 is the minimum API supported by Qt. Using the NDK API instead of JNI boost the performance a lot! The CPU usage dropped 2 to 4 times, from over 60% using the JNI to less than 20%. [ChangeLog][Android] Rewrite Qt Android Sensors using NDK API. Change-Id: If3e3f1e56973e2a189662912b2a6ebfbd71dee14 Reviewed-by: Lorn Potter --- .../sensors/android/src/androidjnisensors.h | 87 ---------------------- 1 file changed, 87 deletions(-) delete mode 100644 src/plugins/sensors/android/src/androidjnisensors.h (limited to 'src/plugins/sensors/android/src/androidjnisensors.h') diff --git a/src/plugins/sensors/android/src/androidjnisensors.h b/src/plugins/sensors/android/src/androidjnisensors.h deleted file mode 100644 index 8aee4fcf..00000000 --- a/src/plugins/sensors/android/src/androidjnisensors.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 BogDan Vatra -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSensors module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ANDROIDJNISENSORS_H -#define ANDROIDJNISENSORS_H - -#include - -#include -#include - -namespace AndroidSensors -{ - // must be in sync with https://developer.android.com/reference/android/hardware/Sensor.html#TYPE_ACCELEROMETER - enum AndroidSensorType - { - TYPE_ACCELEROMETER = 1, - TYPE_AMBIENT_TEMPERATURE = 13, //Added in API level 14 - TYPE_GAME_ROTATION_VECTOR = 15, //Added in API level 18 - TYPE_GRAVITY = 9, - TYPE_GYROSCOPE = 4, - TYPE_GYROSCOPE_UNCALIBRATED = 16, //Added in API level 18 - TYPE_LIGHT = 5, - TYPE_LINEAR_ACCELERATION = 10, - TYPE_MAGNETIC_FIELD = 2, - TYPE_MAGNETIC_FIELD_UNCALIBRATED = 14, //Added in API level 18 - TYPE_ORIENTATION = 3, //This constant was deprecated in API level 8. use SensorManager.getOrientation() instead. - TYPE_PRESSURE = 6, - TYPE_PROXIMITY = 8, - TYPE_RELATIVE_HUMIDITY = 12, //Added in API level 14 - TYPE_ROTATION_VECTOR = 11, - TYPE_SIGNIFICANT_MOTION = 17, //Added in API level 18 - TYPE_TEMPERATURE = 7 //This constant was deprecated in API level 14. use Sensor.TYPE_AMBIENT_TEMPERATURE instead. - }; - - struct AndroidSensorsListenerInterface - { - virtual ~AndroidSensorsListenerInterface() {} - virtual void onAccuracyChanged(jint accuracy) = 0; - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size) = 0; - }; - - QVector availableSensors(); - QString sensorDescription(AndroidSensorType sensor); - qreal sensorMaximumRange(AndroidSensorType sensor); - bool registerListener(AndroidSensorType sensor, AndroidSensorsListenerInterface *listener, int dataRate = 0); - bool unregisterListener(AndroidSensorType sensor, AndroidSensorsListenerInterface *listener); - qreal getCompassAzimuth(jfloat *accelerometerReading, jfloat *magnetometerReading); -} - -#endif // ANDROIDJNISENSORS_H -- cgit v1.2.3