diff options
Diffstat (limited to 'src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp')
-rw-r--r-- | src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp | 45 |
1 files changed, 7 insertions, 38 deletions
diff --git a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp index d3a5b56ff..c5860b265 100644 --- a/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp +++ b/src/plugins/multimedia/android/wrappers/jni/androidsurfacetexture.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part 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$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "androidsurfacetexture_p.h" #include <QtCore/qmutex.h> @@ -48,6 +12,8 @@ typedef QList<jlong> SurfaceTextures; Q_GLOBAL_STATIC(SurfaceTextures, g_surfaceTextures); Q_GLOBAL_STATIC(QMutex, g_textureMutex); +static QAtomicInteger<quint64> indexCounter = 0u; + // native method for QtSurfaceTexture.java static void notifyFrameAvailable(JNIEnv* , jobject, jlong id) { @@ -63,6 +29,7 @@ static void notifyFrameAvailable(JNIEnv* , jobject, jlong id) AndroidSurfaceTexture::AndroidSurfaceTexture(quint32 texName) : QObject() + , m_index(indexCounter.fetchAndAddRelaxed(1)) { Q_STATIC_ASSERT(sizeof (jlong) >= sizeof (void *)); m_surfaceTexture = QJniObject("android/graphics/SurfaceTexture", "(I)V", jint(texName)); @@ -181,3 +148,5 @@ void AndroidSurfaceTexture::setOnFrameAvailableListener(const QJniObject &listen } QT_END_NAMESPACE + +#include "moc_androidsurfacetexture_p.cpp" |