summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/android/src/androidcompass.cpp
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2019-04-02 14:00:37 +0300
committerBogDan Vatra <bogdan@kdab.com>2019-04-11 06:52:45 +0000
commit2c9fc2c1a197b84ba9ef3dc4e586a77a18c3dcc5 (patch)
tree38ac45eb44b585e47542c7b6df20088388836283 /src/plugins/sensors/android/src/androidcompass.cpp
parentf528104474dd74e34ea6a01da096e7c31730c01a (diff)
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 <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/sensors/android/src/androidcompass.cpp')
-rw-r--r--src/plugins/sensors/android/src/androidcompass.cpp177
1 files changed, 0 insertions, 177 deletions
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp
deleted file mode 100644
index 0911d901..00000000
--- a/src/plugins/sensors/android/src/androidcompass.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** 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$
-**
-****************************************************************************/
-
-#include "androidcompass.h"
-
-#include <QDebug>
-#include <qmath.h>
-#include "androidjnisensors.h"
-
-
-class AndroidAccelerometerListener : public AndroidSensors::AndroidSensorsListenerInterface
-{
-public:
-
- AndroidAccelerometerListener(AndroidCompass *parent)
- : accuracy(0), m_compass(parent)
- {
- memset(reading, 0, sizeof(reading));
- }
-
- void start(int dataRate)
- {
- AndroidSensors::registerListener(AndroidSensors::TYPE_ACCELEROMETER, this, dataRate);
- }
-
- void stop()
- {
- AndroidSensors::unregisterListener(AndroidSensors::TYPE_ACCELEROMETER, this);
- }
-
- void onAccuracyChanged(jint value) override
- {
- accuracy = value;
- }
-
- void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
- {
- if (size < 3)
- return;
- reading[0] = values[0];
- reading[1] = values[1];
- reading[2] = values[2];
- m_compass->testStuff();
- }
-
- jfloat reading[3];
- jint accuracy;
-
-private:
- AndroidCompass *m_compass;
-};
-
-class AndroidMagnetometerListener : public AndroidSensors::AndroidSensorsListenerInterface
-{
-public:
- AndroidMagnetometerListener(AndroidCompass *parent)
- : accuracy(0), m_compass(parent)
- {
- memset(reading, 0, sizeof(reading));
- }
-
- void start(int dataRate)
- {
- AndroidSensors::registerListener(AndroidSensors::TYPE_MAGNETIC_FIELD, this, dataRate);
- }
-
- void stop()
- {
- AndroidSensors::unregisterListener(AndroidSensors::TYPE_MAGNETIC_FIELD, this);
- }
-
- void onAccuracyChanged(jint value) override
- {
- accuracy = value;
- }
-
- void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override
- {
- if (size < 3)
- return;
- reading[0] = values[0];
- reading[1] = values[1];
- reading[2] = values[2];
- m_compass->testStuff();
- }
-
- jfloat reading[3];
- jint accuracy;
-private:
- AndroidCompass *m_compass;
-};
-
-char const * const AndroidCompass::id("android.synthetic.compass");
-
-AndroidCompass::AndroidCompass(QSensor *sensor)
- : QSensorBackend(sensor), m_accelerometerListener(0), m_magnetometerListener(0), m_isStarted(false)
-{
- setReading<QCompassReading>(&m_reading);
- m_isStarted = false;
-}
-
-AndroidCompass::~AndroidCompass()
-{
- if (m_isStarted)
- stop();
- delete m_accelerometerListener;
- delete m_magnetometerListener;
-}
-
-void AndroidCompass::start()
-{
- if (!m_accelerometerListener)
- m_accelerometerListener = new AndroidAccelerometerListener(this);
- if (!m_magnetometerListener)
- m_magnetometerListener = new AndroidMagnetometerListener(this);
- m_accelerometerListener->start(sensor()->dataRate());
- m_magnetometerListener->start(sensor()->dataRate());
-
- m_isStarted = true;
-}
-
-void AndroidCompass::stop()
-{
- if (m_isStarted) {
- m_isStarted = false;
- m_accelerometerListener->stop();
- m_magnetometerListener->stop();
- }
-}
-
-void AndroidCompass::testStuff()
-{
- if (!m_accelerometerListener || !m_magnetometerListener)
- return;
- qreal azimuth = AndroidSensors::getCompassAzimuth(m_accelerometerListener->reading, m_magnetometerListener->reading);
-
- m_reading.setAzimuth(qRadiansToDegrees(azimuth));
- const qreal accuracyValue = (m_accelerometerListener->accuracy + m_magnetometerListener->accuracy) / 6;
- m_reading.setCalibrationLevel(accuracyValue);
- newReadingAvailable();
-}