diff options
Diffstat (limited to 'src/plugins/multimedia/android/common')
10 files changed, 426 insertions, 926 deletions
diff --git a/src/plugins/multimedia/android/common/qandroidaudioinput.cpp b/src/plugins/multimedia/android/common/qandroidaudioinput.cpp index 71be7869d..a1eb9258b 100644 --- a/src/plugins/multimedia/android/common/qandroidaudioinput.cpp +++ b/src/plugins/multimedia/android/common/qandroidaudioinput.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 "qandroidaudioinput_p.h" @@ -79,3 +43,5 @@ bool QAndroidAudioInput::isMuted() const } QT_END_NAMESPACE + +#include "moc_qandroidaudioinput_p.cpp" diff --git a/src/plugins/multimedia/android/common/qandroidaudioinput_p.h b/src/plugins/multimedia/android/common/qandroidaudioinput_p.h index 100b13aab..ef59da8ec 100644 --- a/src/plugins/multimedia/android/common/qandroidaudioinput_p.h +++ b/src/plugins/multimedia/android/common/qandroidaudioinput_p.h @@ -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 #ifndef QANDROIDAUDIOINPUT_H #define QANDROIDAUDIOINPUT_H diff --git a/src/plugins/multimedia/android/common/qandroidaudiooutput_p.h b/src/plugins/multimedia/android/common/qandroidaudiooutput_p.h index e17f158fc..d5d25b458 100644 --- a/src/plugins/multimedia/android/common/qandroidaudiooutput_p.h +++ b/src/plugins/multimedia/android/common/qandroidaudiooutput_p.h @@ -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 #ifndef QANDROIDAUDIOOUTPUT_H #define QANDROIDAUDIOOUTPUT_H diff --git a/src/plugins/multimedia/android/common/qandroidglobal_p.h b/src/plugins/multimedia/android/common/qandroidglobal_p.h index 45bd22ffb..1022fa061 100644 --- a/src/plugins/multimedia/android/common/qandroidglobal_p.h +++ b/src/plugins/multimedia/android/common/qandroidglobal_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 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 #ifndef QANDROIDGLOBAL_H #define QANDROIDGLOBAL_H diff --git a/src/plugins/multimedia/android/common/qandroidmultimediautils.cpp b/src/plugins/multimedia/android/common/qandroidmultimediautils.cpp index e333f9520..6e4b95fe9 100644 --- a/src/plugins/multimedia/android/common/qandroidmultimediautils.cpp +++ b/src/plugins/multimedia/android/common/qandroidmultimediautils.cpp @@ -1,47 +1,12 @@ -/**************************************************************************** -** -** 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 "qandroidmultimediautils_p.h" #include "qandroidglobal_p.h" #include <qlist.h> #include <QtCore/qcoreapplication.h> +#include <QtCore/qpermissions.h> #include <QtCore/private/qandroidextras_p.h> QT_BEGIN_NAMESPACE @@ -124,43 +89,27 @@ static bool androidRequestPermission(const QString &permission) return true; } -static bool androidCheckPermission(const QString &permission) +static bool androidCheckPermission(const QPermission &permission) { - if (QNativeInterface::QAndroidApplication::sdkVersion() < 23) - return true; - - // Permission already granted? - return (QtAndroidPrivate::checkPermission(permission).result() == QtAndroidPrivate::Authorized); + return qApp->checkPermission(permission) == Qt::PermissionStatus::Granted; } bool qt_androidCheckCameraPermission() { - return androidCheckPermission(QStringLiteral("android.permission.CAMERA")); + const QCameraPermission permission; + const auto granted = androidCheckPermission(permission); + if (!granted) + qCDebug(qtAndroidMediaPlugin, "Camera permission not granted!"); + return granted; } bool qt_androidCheckMicrophonePermission() { - return androidCheckPermission(QStringLiteral("android.permission.RECORD_AUDIO")); -} - -bool qt_androidRequestCameraPermission() -{ - if (!androidRequestPermission(QStringLiteral("android.permission.CAMERA"))) { - qCDebug(qtAndroidMediaPlugin, "Camera permission denied by user!"); - return false; - } - - return true; -} - -bool qt_androidRequestRecordingPermission() -{ - if (!androidRequestPermission(QStringLiteral("android.permission.RECORD_AUDIO"))) { - qCDebug(qtAndroidMediaPlugin, "Microphone permission denied by user!"); - return false; - } - - return true; + const QMicrophonePermission permission; + const auto granted = androidCheckPermission(permission); + if (!granted) + qCDebug(qtAndroidMediaPlugin, "Microphone permission not granted!"); + return granted; } bool qt_androidRequestWriteStoragePermission() diff --git a/src/plugins/multimedia/android/common/qandroidmultimediautils_p.h b/src/plugins/multimedia/android/common/qandroidmultimediautils_p.h index 5bc187da3..5fe841e8c 100644 --- a/src/plugins/multimedia/android/common/qandroidmultimediautils_p.h +++ b/src/plugins/multimedia/android/common/qandroidmultimediautils_p.h @@ -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 #ifndef QANDROIDMULTIMEDIAUTILS_H #define QANDROIDMULTIMEDIAUTILS_H @@ -66,8 +30,6 @@ bool qt_sizeLessThan(const QSize &s1, const QSize &s2); QVideoFrameFormat::PixelFormat qt_pixelFormatFromAndroidImageFormat(AndroidCamera::ImageFormat f); AndroidCamera::ImageFormat qt_androidImageFormatFromPixelFormat(QVideoFrameFormat::PixelFormat f); -bool qt_androidRequestCameraPermission(); -bool qt_androidRequestRecordingPermission(); bool qt_androidRequestWriteStoragePermission(); bool qt_androidCheckCameraPermission(); diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp index a3a4966cc..0724a8359 100644 --- a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp +++ b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp @@ -1,112 +1,256 @@ -/**************************************************************************** -** -** 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 "qandroidvideooutput_p.h" - #include "androidsurfacetexture_p.h" + +#include <rhi/qrhi.h> +#include <QtGui/private/qopenglextensions_p.h> +#include <private/qhwvideobuffer_p.h> +#include <private/qvideoframeconverter_p.h> +#include <private/qplatformvideosink_p.h> +#include <private/qvideoframe_p.h> #include <qvideosink.h> -#include "private/qabstractvideobuffer_p.h" -#include "private/qplatformvideosink_p.h" -#include <QVideoFrameFormat> -#include <QFile> -#include <QtGui/private/qrhigles2_p.h> -#include <QOpenGLContext> -#include <QPainter> -#include <QPainterPath> -#include <QMutexLocker> -#include <QTextLayout> -#include <QTextFormat> +#include <qopenglcontext.h> +#include <qopenglfunctions.h> +#include <qvideoframeformat.h> +#include <qthread.h> +#include <qfile.h> QT_BEGIN_NAMESPACE -void GraphicsResourceDeleter::deleteResourcesHelper(const QList<QRhiResource *> &res) +class QAndroidVideoFrameTextures : public QVideoFrameTextures { - qDeleteAll(res); -} +public: + QAndroidVideoFrameTextures(QRhi *rhi, QSize size, quint64 handle) + { + m_tex.reset(rhi->newTexture(QRhiTexture::RGBA8, size, 1)); + m_tex->createFrom({quint64(handle), 0}); + } -void GraphicsResourceDeleter::deleteRhiHelper(QRhi *rhi, QOffscreenSurface *surf) -{ - delete rhi; - delete surf; -} + QRhiTexture *texture(uint plane) const override + { + return plane == 0 ? m_tex.get() : nullptr; + } + +private: + std::unique_ptr<QRhiTexture> m_tex; +}; -void GraphicsResourceDeleter::deleteThisHelper() +// QRhiWithThreadGuard keeps QRhi and QThread (that created it) alive to allow proper cleaning +class QRhiWithThreadGuard : public QObject { + Q_OBJECT +public: + QRhiWithThreadGuard(std::shared_ptr<QRhi> r, std::shared_ptr<AndroidTextureThread> t) + : m_guardRhi(std::move(r)), m_thread(std::move(t)) {} + ~QRhiWithThreadGuard(); +protected: + std::shared_ptr<QRhi> m_guardRhi; +private: + std::shared_ptr<AndroidTextureThread> m_thread; +}; + +class AndroidTextureVideoBuffer : public QRhiWithThreadGuard, public QHwVideoBuffer { - delete this; -} +public: + AndroidTextureVideoBuffer(std::shared_ptr<QRhi> rhi, + std::shared_ptr<AndroidTextureThread> thread, + std::unique_ptr<QRhiTexture> tex, const QSize &size) + : QRhiWithThreadGuard(std::move(rhi), std::move(thread)), + QHwVideoBuffer(QVideoFrame::RhiTextureHandle, m_guardRhi.get()), + m_size(size), + m_tex(std::move(tex)) + {} + + MapData map(QtVideo::MapMode mode) override; + + void unmap() override + { + m_image = {}; + m_mapMode = QtVideo::MapMode::NotMapped; + } + + std::unique_ptr<QVideoFrameTextures> mapTextures(QRhi *rhi) override + { + return std::make_unique<QAndroidVideoFrameTextures>(rhi, m_size, m_tex->nativeTexture().object); + } -bool AndroidTextureVideoBuffer::updateReadbackFrame() +private: + QSize m_size; + std::unique_ptr<QRhiTexture> m_tex; + QImage m_image; + QtVideo::MapMode m_mapMode = QtVideo::MapMode::NotMapped; +}; + +class ImageFromVideoFrameHelper : public QHwVideoBuffer { - // Even though the texture was updated in a previous call, we need to re-check - // that this has not become a stale buffer, e.g., if the output size changed or - // has since became invalid. - if (!m_output->m_nativeSize.isValid()) - return false; - - // Size changed - if (m_output->m_nativeSize != m_size) - return false; - - // In the unlikely event that we don't have a valid fbo, but have a valid size, - // force an update. - const bool forceUpdate = !m_output->m_readbackTex; - if (m_textureUpdated && !forceUpdate) - return true; - - // update the video texture (called from the render thread) - return (m_textureUpdated = m_output->renderAndReadbackFrame()); -} +public: + ImageFromVideoFrameHelper(AndroidTextureVideoBuffer &atvb) + : QHwVideoBuffer(QVideoFrame::RhiTextureHandle, atvb.rhi()), m_atvb(atvb) + {} + std::unique_ptr<QVideoFrameTextures> mapTextures(QRhi *rhi) override + { + return m_atvb.mapTextures(rhi); + } + + MapData map(QtVideo::MapMode) override { return {}; } + void unmap() override {} -QAbstractVideoBuffer::MapData AndroidTextureVideoBuffer::map(QVideoFrame::MapMode mode) +private: + AndroidTextureVideoBuffer &m_atvb; +}; + +QAbstractVideoBuffer::MapData AndroidTextureVideoBuffer::map(QtVideo::MapMode mode) { - MapData mapData; - if (m_mapMode == QVideoFrame::NotMapped && mode == QVideoFrame::ReadOnly && updateReadbackFrame()) { - m_mapMode = mode; - m_image = m_output->m_readbackImage; - mapData.nPlanes = 1; + QAbstractVideoBuffer::MapData mapData; + + if (m_mapMode == QtVideo::MapMode::NotMapped && mode == QtVideo::MapMode::ReadOnly) { + m_mapMode = QtVideo::MapMode::ReadOnly; + m_image = qImageFromVideoFrame(QVideoFramePrivate::createFrame( + std::make_unique<ImageFromVideoFrameHelper>(*this), + QVideoFrameFormat(m_size, QVideoFrameFormat::Format_RGBA8888))); + mapData.planeCount = 1; mapData.bytesPerLine[0] = m_image.bytesPerLine(); - mapData.size[0] = static_cast<int>(m_image.sizeInBytes()); + mapData.dataSize[0] = static_cast<int>(m_image.sizeInBytes()); mapData.data[0] = m_image.bits(); } + return mapData; } +static const float g_quad[] = { + -1.f, -1.f, 0.f, 0.f, + -1.f, 1.f, 0.f, 1.f, + 1.f, 1.f, 1.f, 1.f, + 1.f, -1.f, 1.f, 0.f +}; + +class TextureCopy +{ + static QShader getShader(const QString &name) + { + QFile f(name); + if (f.open(QIODevice::ReadOnly)) + return QShader::fromSerialized(f.readAll()); + return {}; + } + +public: + TextureCopy(QRhi *rhi, QRhiTexture *externalTex) + : m_rhi(rhi) + { + m_vertexBuffer.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_quad))); + m_vertexBuffer->create(); + + m_uniformBuffer.reset(m_rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 64 + 64 + 4 + 4)); + m_uniformBuffer->create(); + + m_sampler.reset(m_rhi->newSampler(QRhiSampler::Nearest, QRhiSampler::Nearest, QRhiSampler::None, + QRhiSampler::ClampToEdge, QRhiSampler::ClampToEdge)); + m_sampler->create(); + + m_srb.reset(m_rhi->newShaderResourceBindings()); + m_srb->setBindings({ + QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, m_uniformBuffer.get()), + QRhiShaderResourceBinding::sampledTexture(1, QRhiShaderResourceBinding::FragmentStage, externalTex, m_sampler.get()) + }); + m_srb->create(); + + m_vertexShader = getShader(QStringLiteral(":/qt-project.org/multimedia/shaders/externalsampler.vert.qsb")); + Q_ASSERT(m_vertexShader.isValid()); + m_fragmentShader = getShader(QStringLiteral(":/qt-project.org/multimedia/shaders/externalsampler.frag.qsb")); + Q_ASSERT(m_fragmentShader.isValid()); + } + + std::unique_ptr<QRhiTexture> copyExternalTexture(QSize size, const QMatrix4x4 &externalTexMatrix); + +private: + QRhi *m_rhi = nullptr; + std::unique_ptr<QRhiBuffer> m_vertexBuffer; + std::unique_ptr<QRhiBuffer> m_uniformBuffer; + std::unique_ptr<QRhiSampler> m_sampler; + std::unique_ptr<QRhiShaderResourceBindings> m_srb; + QShader m_vertexShader; + QShader m_fragmentShader; +}; + +static std::unique_ptr<QRhiGraphicsPipeline> newGraphicsPipeline(QRhi *rhi, + QRhiShaderResourceBindings *shaderResourceBindings, + QRhiRenderPassDescriptor *renderPassDescriptor, + QShader vertexShader, + QShader fragmentShader) +{ + std::unique_ptr<QRhiGraphicsPipeline> gp(rhi->newGraphicsPipeline()); + gp->setTopology(QRhiGraphicsPipeline::TriangleFan); + gp->setShaderStages({ + { QRhiShaderStage::Vertex, vertexShader }, + { QRhiShaderStage::Fragment, fragmentShader } + }); + QRhiVertexInputLayout inputLayout; + inputLayout.setBindings({ + { 4 * sizeof(float) } + }); + inputLayout.setAttributes({ + { 0, 0, QRhiVertexInputAttribute::Float2, 0 }, + { 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) } + }); + gp->setVertexInputLayout(inputLayout); + gp->setShaderResourceBindings(shaderResourceBindings); + gp->setRenderPassDescriptor(renderPassDescriptor); + gp->create(); + + return gp; +} + +std::unique_ptr<QRhiTexture> TextureCopy::copyExternalTexture(QSize size, const QMatrix4x4 &externalTexMatrix) +{ + std::unique_ptr<QRhiTexture> tex(m_rhi->newTexture(QRhiTexture::RGBA8, size, 1, QRhiTexture::RenderTarget)); + if (!tex->create()) { + qWarning("Failed to create frame texture"); + return {}; + } + + std::unique_ptr<QRhiTextureRenderTarget> renderTarget(m_rhi->newTextureRenderTarget({ { tex.get() } })); + std::unique_ptr<QRhiRenderPassDescriptor> renderPassDescriptor(renderTarget->newCompatibleRenderPassDescriptor()); + renderTarget->setRenderPassDescriptor(renderPassDescriptor.get()); + renderTarget->create(); + + QRhiResourceUpdateBatch *rub = m_rhi->nextResourceUpdateBatch(); + rub->uploadStaticBuffer(m_vertexBuffer.get(), g_quad); + + QMatrix4x4 identity; + char *p = m_uniformBuffer->beginFullDynamicBufferUpdateForCurrentFrame(); + memcpy(p, identity.constData(), 64); + memcpy(p + 64, externalTexMatrix.constData(), 64); + float opacity = 1.0f; + memcpy(p + 64 + 64, &opacity, 4); + m_uniformBuffer->endFullDynamicBufferUpdateForCurrentFrame(); + + auto graphicsPipeline = newGraphicsPipeline(m_rhi, m_srb.get(), renderPassDescriptor.get(), + m_vertexShader, m_fragmentShader); + + const QRhiCommandBuffer::VertexInput vbufBinding(m_vertexBuffer.get(), 0); + + QRhiCommandBuffer *cb = nullptr; + if (m_rhi->beginOffscreenFrame(&cb) != QRhi::FrameOpSuccess) + return {}; + + cb->beginPass(renderTarget.get(), Qt::transparent, { 1.0f, 0 }, rub); + cb->setGraphicsPipeline(graphicsPipeline.get()); + cb->setViewport({0, 0, float(size.width()), float(size.height())}); + cb->setShaderResources(m_srb.get()); + cb->setVertexInput(0, 1, &vbufBinding); + cb->draw(4); + cb->endPass(); + m_rhi->endOffscreenFrame(); + + QOpenGLContext *ctx = QOpenGLContext::currentContext(); + QOpenGLFunctions *f = ctx->functions(); + static_cast<QOpenGLExtensions *>(f)->flushShared(); + + return tex; +} + static QMatrix4x4 extTransformMatrix(AndroidSurfaceTexture *surfaceTexture) { QMatrix4x4 m = surfaceTexture->getTransformMatrix(); @@ -121,419 +265,204 @@ static QMatrix4x4 extTransformMatrix(AndroidSurfaceTexture *surfaceTexture) return m; } -quint64 AndroidTextureVideoBuffer::textureHandle(int plane) const +class AndroidTextureThread : public QThread { - if (plane != 0 || !m_rhi || !m_output->m_nativeSize.isValid()) - return 0; - - m_output->ensureExternalTexture(m_rhi); - m_output->m_surfaceTexture->updateTexImage(); - m_externalMatrix = extTransformMatrix(m_output->m_surfaceTexture); - return m_output->m_externalTex->nativeTexture().object; -} + Q_OBJECT +public: + AndroidTextureThread(QAndroidTextureVideoOutput * vo) + : QThread() + , m_videoOutput(vo) + { + } -QAndroidTextureVideoOutput::QAndroidTextureVideoOutput(QObject *parent) : QAndroidVideoOutput(parent) { } + ~AndroidTextureThread() { + QMetaObject::invokeMethod(this, + &AndroidTextureThread::clearSurfaceTexture, Qt::BlockingQueuedConnection); + this->quit(); + this->wait(); + } -QAndroidTextureVideoOutput::~QAndroidTextureVideoOutput() -{ - clearSurfaceTexture(); - - if (m_graphicsDeleter) { // Make sure all of these are deleted on the render thread. - m_graphicsDeleter->deleteResources({ - m_externalTex, - m_readbackSrc, - m_readbackTex, - m_readbackVBuf, - m_readbackUBuf, - m_externalTexSampler, - m_readbackSrb, - m_readbackRenderTarget, - m_readbackRpDesc, - m_readbackPs - }); + void start() + { + QThread::start(); + moveToThread(this); + } - m_graphicsDeleter->deleteRhi(m_readbackRhi, m_readbackRhiFallbackSurface); - m_graphicsDeleter->deleteThis(); + void initRhi(QOpenGLContext *context) + { + QRhiGles2InitParams params; + params.shareContext = context; + params.fallbackSurface = QRhiGles2InitParams::newFallbackSurface(); + m_rhi.reset(QRhi::create(QRhi::OpenGLES2, ¶ms)); } -} -void QAndroidTextureVideoOutput::setSubtitle(const QString &subtitle) -{ - if (!m_sink) - return; - auto *sink = m_sink->platformVideoSink(); - sink->setSubtitleText(subtitle); -} +public slots: + void onFrameAvailable(quint64 index) + { + // Check if 'm_surfaceTexture' is not reset and if the current index is the same that + // was used for creating connection because there can be pending frames in queue. + if (m_surfaceTexture && m_surfaceTexture->index() == index) { + m_surfaceTexture->updateTexImage(); + auto matrix = extTransformMatrix(m_surfaceTexture.get()); + auto tex = m_textureCopy->copyExternalTexture(m_size, matrix); + auto *buffer = new AndroidTextureVideoBuffer(m_rhi, m_videoOutput->getSurfaceThread(), std::move(tex), m_size); + QVideoFrame frame(buffer, QVideoFrameFormat(m_size, QVideoFrameFormat::Format_RGBA8888)); + emit newFrame(frame); + } + } -QVideoSink *QAndroidTextureVideoOutput::surface() const -{ - return m_sink; -} + void clearFrame() { emit newFrame({}); } -void QAndroidTextureVideoOutput::setSurface(QVideoSink *surface) -{ - if (surface == m_sink) - return; + void setFrameSize(QSize size) { m_size = size; } - m_sink = surface; -} + void clearSurfaceTexture() + { + m_surfaceTexture.reset(); + m_texture.reset(); + m_textureCopy.reset(); + m_rhi.reset(); + } -bool QAndroidTextureVideoOutput::isReady() -{ - return true; -} + AndroidSurfaceTexture *createSurfaceTexture(QRhi *rhi) + { + if (m_surfaceTexture) + return m_surfaceTexture.get(); -void QAndroidTextureVideoOutput::initSurfaceTexture() -{ - if (m_surfaceTexture) - return; + QOpenGLContext *ctx = rhi + ? static_cast<const QRhiGles2NativeHandles *>(rhi->nativeHandles())->context + : nullptr; + initRhi(ctx); - if (!m_sink) - return; + m_texture.reset(m_rhi->newTexture(QRhiTexture::RGBA8, m_size, 1, QRhiTexture::ExternalOES)); + m_texture->create(); + m_surfaceTexture = std::make_unique<AndroidSurfaceTexture>(m_texture->nativeTexture().object); + if (m_surfaceTexture->surfaceTexture()) { + const quint64 index = m_surfaceTexture->index(); + connect(m_surfaceTexture.get(), &AndroidSurfaceTexture::frameAvailable, this, + [this, index] () { this->onFrameAvailable(index); }); - QMutexLocker locker(&m_mutex); + m_textureCopy = std::make_unique<TextureCopy>(m_rhi.get(), m_texture.get()); - m_surfaceTexture = new AndroidSurfaceTexture(m_externalTex ? m_externalTex->nativeTexture().object : 0); + } else { + m_texture.reset(); + m_surfaceTexture.reset(); + } - if (m_surfaceTexture->surfaceTexture() != 0) { - connect(m_surfaceTexture, &AndroidSurfaceTexture::frameAvailable, - this, &QAndroidTextureVideoOutput::onFrameAvailable); - } else { - delete m_surfaceTexture; - m_surfaceTexture = nullptr; - if (m_graphicsDeleter) - m_graphicsDeleter->deleteResources({ m_externalTex }); - m_externalTex = nullptr; + return m_surfaceTexture.get(); } -} -void QAndroidTextureVideoOutput::clearSurfaceTexture() -{ - QMutexLocker locker(&m_mutex); - if (m_surfaceTexture) { - delete m_surfaceTexture; - m_surfaceTexture = nullptr; - } +signals: + void newFrame(const QVideoFrame &); - // Also reset the attached texture - if (m_graphicsDeleter) - m_graphicsDeleter->deleteResources({ m_externalTex }); - m_externalTex = nullptr; -} +private: + QAndroidTextureVideoOutput * m_videoOutput; + std::shared_ptr<QRhi> m_rhi; + std::unique_ptr<AndroidSurfaceTexture> m_surfaceTexture; + std::unique_ptr<QRhiTexture> m_texture; + std::unique_ptr<TextureCopy> m_textureCopy; + QSize m_size; +}; -AndroidSurfaceTexture *QAndroidTextureVideoOutput::surfaceTexture() -{ - initSurfaceTexture(); - return m_surfaceTexture; +QRhiWithThreadGuard::~QRhiWithThreadGuard() { + // It may happen that reseting m_rhi shared_ptr will delete it (if it is the last reference) + // QRHI need to be deleted from the thread that created it. + QMetaObject::invokeMethod(m_thread.get(), [&]() {m_guardRhi.reset();}, Qt::BlockingQueuedConnection); } -void QAndroidTextureVideoOutput::setVideoSize(const QSize &size) +QAndroidTextureVideoOutput::QAndroidTextureVideoOutput(QVideoSink *sink, QObject *parent) + : QAndroidVideoOutput(parent) + , m_sink(sink) { - QMutexLocker locker(&m_mutex); - if (m_nativeSize == size) + if (!m_sink) { + qDebug() << "Cannot create QAndroidTextureVideoOutput without a sink."; + m_surfaceThread = nullptr; return; + } - stop(); - - m_nativeSize = size; + startNewSurfaceThread(); } -void QAndroidTextureVideoOutput::start() +void QAndroidTextureVideoOutput::startNewSurfaceThread() { - m_started = true; - renderAndReadbackFrame(); + m_surfaceThread = std::make_shared<AndroidTextureThread>(this); + connect(m_surfaceThread.get(), &AndroidTextureThread::newFrame, + this, &QAndroidTextureVideoOutput::newFrame); + m_surfaceThread->start(); } -void QAndroidTextureVideoOutput::stop() +QAndroidTextureVideoOutput::~QAndroidTextureVideoOutput() { - m_nativeSize = QSize(); - m_started = false; + // Make sure that no more VideFrames will be created by surfaceThread + QMetaObject::invokeMethod(m_surfaceThread.get(), + &AndroidTextureThread::clearSurfaceTexture, Qt::BlockingQueuedConnection); } -void QAndroidTextureVideoOutput::renderFrame() +void QAndroidTextureVideoOutput::setSubtitle(const QString &subtitle) { - if (!m_started) { - m_renderFrame = true; - bool frameok = renderAndReadbackFrame(); - if (!frameok) { - m_renderFrame = true; - renderAndReadbackFrame(); - } + if (m_sink) { + auto *sink = m_sink->platformVideoSink(); + if (sink) + sink->setSubtitleText(subtitle); } } -void QAndroidTextureVideoOutput::reset() +bool QAndroidTextureVideoOutput::shouldTextureBeUpdated() const { - // flush pending frame - if (m_sink) - m_sink->platformVideoSink()->setVideoFrame(QVideoFrame()); - - clearSurfaceTexture(); + return m_sink->rhi() && m_surfaceCreatedWithoutRhi; } -bool QAndroidTextureVideoOutput::moveToOpenGLContextThread() +AndroidSurfaceTexture *QAndroidTextureVideoOutput::surfaceTexture() { if (!m_sink) - return false; - - const auto rhi = m_sink->rhi(); - if (!rhi || rhi->backend() != QRhi::OpenGLES2) - return false; - - const auto nativeHandles = static_cast<const QRhiGles2NativeHandles *>(rhi->nativeHandles()); - if (!nativeHandles) - return false; - - const auto context = nativeHandles->context; - if (!context) - return false; - - // check if QAndroidTextureVideoOutput is already in the OpenGL context thread - if (QThread::currentThread() == context->thread()) - return false; - - // move to the OpenGL context thread; - parent()->moveToThread(context->thread()); - moveToThread(context->thread()); - - return true; + return nullptr; + + AndroidSurfaceTexture *surface = nullptr; + QMetaObject::invokeMethod(m_surfaceThread.get(), [&]() { + auto rhi = m_sink->rhi(); + if (!rhi) { + m_surfaceCreatedWithoutRhi = true; + } + else if (m_surfaceCreatedWithoutRhi) { + m_surfaceThread->clearSurfaceTexture(); + m_surfaceCreatedWithoutRhi = false; + } + surface = m_surfaceThread->createSurfaceTexture(rhi); + }, + Qt::BlockingQueuedConnection); + return surface; } -void QAndroidTextureVideoOutput::onFrameAvailable() +void QAndroidTextureVideoOutput::setVideoSize(const QSize &size) { - if (!(m_nativeSize.isValid() && m_sink) || !(m_started || m_renderFrame)) + if (m_nativeSize == size) return; - m_renderFrame = false; - QRhi *rhi = m_sink ? m_sink->rhi() : nullptr; - - auto *buffer = new AndroidTextureVideoBuffer(rhi, this, m_nativeSize); - const QVideoFrameFormat::PixelFormat format = rhi ? QVideoFrameFormat::Format_SamplerExternalOES - : QVideoFrameFormat::Format_RGBA8888; - QVideoFrame frame(buffer, QVideoFrameFormat(m_nativeSize, format)); - m_sink->platformVideoSink()->setVideoFrame(frame); - - QMetaObject::invokeMethod(m_surfaceTexture, "frameAvailable", Qt::QueuedConnection); + m_nativeSize = size; + QMetaObject::invokeMethod(m_surfaceThread.get(), + [&](){ m_surfaceThread->setFrameSize(size); }, + Qt::BlockingQueuedConnection); } -static const float g_quad[] = { - -1.f, -1.f, 0.f, 0.f, - -1.f, 1.f, 0.f, 1.f, - 1.f, 1.f, 1.f, 1.f, - 1.f, -1.f, 1.f, 0.f -}; - -static QShader getShader(const QString &name) +void QAndroidTextureVideoOutput::stop() { - QFile f(name); - if (f.open(QIODevice::ReadOnly)) - return QShader::fromSerialized(f.readAll()); - - return QShader(); + m_nativeSize = {}; + QMetaObject::invokeMethod(m_surfaceThread.get(), [&](){ m_surfaceThread->clearFrame(); }); } -bool QAndroidTextureVideoOutput::renderAndReadbackFrame() +void QAndroidTextureVideoOutput::reset() { - QMutexLocker locker(&m_mutex); - - if (!m_nativeSize.isValid() || !m_surfaceTexture) - return false; - - if (moveToOpenGLContextThread()) { - // just moved to another thread, must close the execution of this method - QMetaObject::invokeMethod(this, "onFrameAvailable", Qt::ConnectionType::DirectConnection); - return false; - } - - if (!m_readbackRhi) { - QRhi *sinkRhi = m_sink ? m_sink->rhi() : nullptr; - if (sinkRhi && sinkRhi->backend() == QRhi::OpenGLES2) { - // There is an rhi from the sink, e.g. VideoOutput. We lack the necessary - // insight to use that directly, so create our own a QRhi that just wraps the - // same QOpenGLContext. - - const auto constHandles = - static_cast<const QRhiGles2NativeHandles *>(sinkRhi->nativeHandles()); - if (!constHandles) { - qWarning("Failed to get the QRhiGles2NativeHandles to create QRhi readback."); - return false; - } - - auto handles = const_cast<QRhiGles2NativeHandles *>(constHandles); - const auto context = handles->context; - if (!context) { - qWarning("Failed to get the QOpenGLContext to create QRhi readback."); - return false; - } - - sinkRhi->finish(); - m_readbackRhiFallbackSurface = - QRhiGles2InitParams::newFallbackSurface(context->format()); - QRhiGles2InitParams initParams; - initParams.format = context->format(); - initParams.fallbackSurface = m_readbackRhiFallbackSurface; - context->doneCurrent(); - - m_readbackRhi = QRhi::create(QRhi::OpenGLES2, &initParams, {}, handles); - } else { - // No rhi from the sink, e.g. QVideoWidget. - // We will fire up our own QRhi with its own QOpenGLContext. - m_readbackRhiFallbackSurface = QRhiGles2InitParams::newFallbackSurface({}); - QRhiGles2InitParams initParams; - initParams.fallbackSurface = m_readbackRhiFallbackSurface; - m_readbackRhi = QRhi::create(QRhi::OpenGLES2, &initParams); - } - } - - if (!m_readbackRhi) { - qWarning("Failed to create QRhi for video frame readback"); - return false; - } - - QRhiCommandBuffer *cb = nullptr; - if (m_readbackRhi->beginOffscreenFrame(&cb) != QRhi::FrameOpSuccess) - return false; - - if (!m_readbackTex || m_readbackTex->pixelSize() != m_nativeSize) { - delete m_readbackRenderTarget; - delete m_readbackRpDesc; - delete m_readbackTex; - m_readbackTex = m_readbackRhi->newTexture(QRhiTexture::RGBA8, m_nativeSize, 1, QRhiTexture::RenderTarget); - if (!m_readbackTex->create()) { - qWarning("Failed to create readback texture"); - return false; - } - m_readbackRenderTarget = m_readbackRhi->newTextureRenderTarget({ { m_readbackTex } }); - m_readbackRpDesc = m_readbackRenderTarget->newCompatibleRenderPassDescriptor(); - m_readbackRenderTarget->setRenderPassDescriptor(m_readbackRpDesc); - m_readbackRenderTarget->create(); - } - - m_readbackRhi->makeThreadLocalNativeContextCurrent(); - ensureExternalTexture(m_readbackRhi); - m_surfaceTexture->updateTexImage(); - - // The only purpose of m_readbackSrc is to be nice and have a QRhiTexture that belongs - // to m_readbackRhi, not the sink's rhi if there is one. The underlying native object - // (and the rhi's OpenGL context) are the same regardless. - if (!m_readbackSrc) - m_readbackSrc = m_readbackRhi->newTexture(QRhiTexture::RGBA8, m_nativeSize, 1, QRhiTexture::ExternalOES); - - // Keep the object the same (therefore all references to m_readbackSrc in - // the srb or other objects stay valid all the time), just call createFrom - // if the native external texture changes. - const quint64 texId = m_externalTex->nativeTexture().object; - if (m_readbackSrc->nativeTexture().object != texId) - m_readbackSrc->createFrom({ texId, 0 }); - - QRhiResourceUpdateBatch *rub = nullptr; - if (!m_readbackVBuf) { - m_readbackVBuf = m_readbackRhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(g_quad)); - m_readbackVBuf->create(); - if (!rub) - rub = m_readbackRhi->nextResourceUpdateBatch(); - rub->uploadStaticBuffer(m_readbackVBuf, g_quad); - } - - if (!m_readbackUBuf) { - m_readbackUBuf = m_readbackRhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 64 + 64 + 4 + 4); - m_readbackUBuf->create(); - } - - if (!m_externalTexSampler) { - m_externalTexSampler = m_readbackRhi->newSampler(QRhiSampler::Nearest, QRhiSampler::Nearest, QRhiSampler::None, - QRhiSampler::ClampToEdge, QRhiSampler::ClampToEdge); - m_externalTexSampler->create(); - } - - if (!m_readbackSrb) { - m_readbackSrb = m_readbackRhi->newShaderResourceBindings(); - m_readbackSrb->setBindings({ - QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, m_readbackUBuf), - QRhiShaderResourceBinding::sampledTexture(1, QRhiShaderResourceBinding::FragmentStage, m_readbackSrc, m_externalTexSampler) - }); - m_readbackSrb->create(); - } - - if (!m_readbackPs) { - m_readbackPs = m_readbackRhi->newGraphicsPipeline(); - m_readbackPs->setTopology(QRhiGraphicsPipeline::TriangleFan); - QShader vs = getShader(QStringLiteral(":/qt-project.org/multimedia/shaders/externalsampler.vert.qsb")); - Q_ASSERT(vs.isValid()); - QShader fs = getShader(QStringLiteral(":/qt-project.org/multimedia/shaders/externalsampler.frag.qsb")); - Q_ASSERT(fs.isValid()); - m_readbackPs->setShaderStages({ - { QRhiShaderStage::Vertex, vs }, - { QRhiShaderStage::Fragment, fs } - }); - QRhiVertexInputLayout inputLayout; - inputLayout.setBindings({ - { 4 * sizeof(float) } - }); - inputLayout.setAttributes({ - { 0, 0, QRhiVertexInputAttribute::Float2, 0 }, - { 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) } - }); - m_readbackPs->setVertexInputLayout(inputLayout); - m_readbackPs->setShaderResourceBindings(m_readbackSrb); - m_readbackPs->setRenderPassDescriptor(m_readbackRpDesc); - m_readbackPs->create(); - } - - QMatrix4x4 identity; - char *p = m_readbackUBuf->beginFullDynamicBufferUpdateForCurrentFrame(); - memcpy(p, identity.constData(), 64); - QMatrix4x4 extMatrix = extTransformMatrix(m_surfaceTexture); - memcpy(p + 64, extMatrix.constData(), 64); - float opacity = 1.0f; - memcpy(p + 64 + 64, &opacity, 4); - m_readbackUBuf->endFullDynamicBufferUpdateForCurrentFrame(); - - cb->beginPass(m_readbackRenderTarget, Qt::transparent, { 1.0f, 0 }, rub); - cb->setGraphicsPipeline(m_readbackPs); - cb->setViewport(QRhiViewport(0, 0, m_nativeSize.width(), m_nativeSize.height())); - cb->setShaderResources(); - const QRhiCommandBuffer::VertexInput vbufBinding(m_readbackVBuf, 0); - cb->setVertexInput(0, 1, &vbufBinding); - cb->draw(4); - - QRhiReadbackDescription readDesc(m_readbackTex); - QRhiReadbackResult readResult; - bool readCompleted = false; - // invoked at latest in the endOffscreenFrame() below - readResult.completed = [&readCompleted] { readCompleted = true; }; - rub = m_readbackRhi->nextResourceUpdateBatch(); - rub->readBackTexture(readDesc, &readResult); - - cb->endPass(rub); - - m_readbackRhi->endOffscreenFrame(); - - if (!readCompleted) - return false; - - // implicit sharing, keep the data alive - m_readbackImageData = readResult.data; - // the QImage does not own the data - m_readbackImage = QImage(reinterpret_cast<const uchar *>(m_readbackImageData.constData()), - readResult.pixelSize.width(), readResult.pixelSize.height(), - QImage::Format_ARGB32_Premultiplied); - - return true; + if (m_sink) + m_sink->platformVideoSink()->setVideoFrame({}); + QMetaObject::invokeMethod(m_surfaceThread.get(), &AndroidTextureThread::clearSurfaceTexture); } -void QAndroidTextureVideoOutput::ensureExternalTexture(QRhi *rhi) +void QAndroidTextureVideoOutput::newFrame(const QVideoFrame &frame) { - if (!m_graphicsDeleter) - m_graphicsDeleter = new GraphicsResourceDeleter; - - if (!m_externalTex) { - m_surfaceTexture->detachFromGLContext(); - m_externalTex = rhi->newTexture(QRhiTexture::RGBA8, m_nativeSize, 1, QRhiTexture::ExternalOES); - if (!m_externalTex->create()) - qWarning("Failed to create native texture object"); - m_surfaceTexture->attachToGLContext(m_externalTex->nativeTexture().object); - } + if (m_sink) + m_sink->setVideoFrame(frame); } QT_END_NAMESPACE + +#include "qandroidvideooutput.moc" +#include "moc_qandroidvideooutput_p.cpp" diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput_p.h b/src/plugins/multimedia/android/common/qandroidvideooutput_p.h index 377f3a4eb..7c9be5aee 100644 --- a/src/plugins/multimedia/android/common/qandroidvideooutput_p.h +++ b/src/plugins/multimedia/android/common/qandroidvideooutput_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 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 #ifndef QANDROIDVIDEOOUTPUT_H #define QANDROIDVIDEOOUTPUT_H @@ -51,15 +15,13 @@ // We mean it. // -#include <qobject.h> #include <qsize.h> #include <qmutex.h> #include <qreadwritelock.h> -#include <private/qabstractvideobuffer_p.h> +#include <qabstractvideobuffer.h> #include <qmatrix4x4.h> -#include <QtGui/private/qrhi_p.h> -#include <QtGui/qoffscreensurface.h> -#include <QPixmap> +#include <qoffscreensurface.h> +#include <rhi/qrhi.h> QT_BEGIN_NAMESPACE @@ -82,6 +44,7 @@ public: virtual void start() { } virtual void stop() { } virtual void reset() { } + virtual QSize getVideoSize() const { return QSize(0, 0); } Q_SIGNALS: void readyChanged(bool); @@ -90,126 +53,36 @@ protected: QAndroidVideoOutput(QObject *parent) : QObject(parent) { } }; -class GraphicsResourceDeleter : public QObject -{ - Q_OBJECT -public: - void deleteResources(const QList<QRhiResource *> &res) { QMetaObject::invokeMethod(this, "deleteResourcesHelper", Qt::AutoConnection, Q_ARG(QList<QRhiResource*>, res)); } - void deleteRhi(QRhi *rhi, QOffscreenSurface *surf) { QMetaObject::invokeMethod(this, "deleteRhiHelper", Qt::AutoConnection, Q_ARG(QRhi*, rhi), Q_ARG(QOffscreenSurface*, surf)); } - void deleteThis() { QMetaObject::invokeMethod(this, "deleteThisHelper"); } - -private: - Q_INVOKABLE void deleteResourcesHelper(const QList<QRhiResource *> &res); - Q_INVOKABLE void deleteRhiHelper(QRhi *rhi, QOffscreenSurface *surf); - Q_INVOKABLE void deleteThisHelper(); -}; - +class AndroidTextureThread; class QAndroidTextureVideoOutput : public QAndroidVideoOutput { Q_OBJECT public: - explicit QAndroidTextureVideoOutput(QObject *parent = 0); + explicit QAndroidTextureVideoOutput(QVideoSink *sink, QObject *parent = 0); ~QAndroidTextureVideoOutput() override; - QVideoSink *surface() const; - void setSurface(QVideoSink *surface); + QVideoSink *surface() const { return m_sink; } + bool shouldTextureBeUpdated() const; AndroidSurfaceTexture *surfaceTexture() override; - bool isReady() override; void setVideoSize(const QSize &) override; - void start() override; void stop() override; void reset() override; - void renderFrame(); + QSize getVideoSize() const override { return m_nativeSize; } void setSubtitle(const QString &subtitle); + std::shared_ptr<AndroidTextureThread> getSurfaceThread() { return m_surfaceThread; } private Q_SLOTS: - void onFrameAvailable(); + void newFrame(const QVideoFrame &); private: - void initSurfaceTexture(); - bool renderAndReadbackFrame(); - void ensureExternalTexture(QRhi *rhi); - - bool moveToOpenGLContextThread(); - - QMutex m_mutex; - QReadWriteLock m_subtitleLock; - - void clearSurfaceTexture(); - + void startNewSurfaceThread(); QVideoSink *m_sink = nullptr; QSize m_nativeSize; - bool m_started = false; - bool m_renderFrame = false; - - AndroidSurfaceTexture *m_surfaceTexture = nullptr; - - QRhiTexture *m_externalTex = nullptr; - - QRhi *m_readbackRhi = nullptr; - QOffscreenSurface *m_readbackRhiFallbackSurface = nullptr; - QRhiTexture *m_readbackSrc = nullptr; - QRhiTexture *m_readbackTex = nullptr; - QRhiBuffer *m_readbackVBuf = nullptr; - QRhiBuffer *m_readbackUBuf = nullptr; - QRhiSampler *m_externalTexSampler = nullptr; - QRhiShaderResourceBindings *m_readbackSrb = nullptr; - QRhiTextureRenderTarget *m_readbackRenderTarget = nullptr; - QRhiRenderPassDescriptor *m_readbackRpDesc = nullptr; - QRhiGraphicsPipeline *m_readbackPs = nullptr; - - QImage m_readbackImage; - QByteArray m_readbackImageData; + bool m_surfaceCreatedWithoutRhi = false; - QString m_subtitleText; - QPixmap m_subtitlePixmap; - - GraphicsResourceDeleter *m_graphicsDeleter = nullptr; - - friend class AndroidTextureVideoBuffer; -}; - - -class AndroidTextureVideoBuffer : public QAbstractVideoBuffer -{ -public: - AndroidTextureVideoBuffer(QRhi *rhi, QAndroidTextureVideoOutput *output, const QSize &size) - : QAbstractVideoBuffer(rhi ? QVideoFrame::RhiTextureHandle : QVideoFrame::NoHandle, rhi) - , m_output(output) - , m_size(size) - { - } - - virtual ~AndroidTextureVideoBuffer() {} - - QVideoFrame::MapMode mapMode() const override { return m_mapMode; } - - MapData map(QVideoFrame::MapMode mode) override; - - void unmap() override - { - m_image = QImage(); - m_mapMode = QVideoFrame::NotMapped; - } - - quint64 textureHandle(int plane) const override; - - QMatrix4x4 externalTextureMatrix() const override - { - return m_externalMatrix; - } - -private: - bool updateReadbackFrame(); - - QVideoFrame::MapMode m_mapMode = QVideoFrame::NotMapped; - QAndroidTextureVideoOutput *m_output = nullptr; - QImage m_image; - QSize m_size; - mutable QMatrix4x4 m_externalMatrix; - bool m_textureUpdated = false; + std::shared_ptr<AndroidTextureThread> m_surfaceThread; }; QT_END_NAMESPACE diff --git a/src/plugins/multimedia/android/common/qandroidvideosink.cpp b/src/plugins/multimedia/android/common/qandroidvideosink.cpp index 7cc0fefe4..3da5eab31 100644 --- a/src/plugins/multimedia/android/common/qandroidvideosink.cpp +++ b/src/plugins/multimedia/android/common/qandroidvideosink.cpp @@ -1,44 +1,8 @@ -/**************************************************************************** -** -** 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 "qandroidvideosink_p.h" -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtCore/qdebug.h> @@ -46,8 +10,6 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(qLcMediaVideoSink, "qt.multimedia.videosink") - QAndroidVideoSink::QAndroidVideoSink(QVideoSink *parent) : QPlatformVideoSink(parent) { @@ -65,6 +27,9 @@ void QAndroidVideoSink::setRhi(QRhi *rhi) return; m_rhi = rhi; + emit rhiChanged(rhi); } QT_END_NAMESPACE + +#include "moc_qandroidvideosink_p.cpp" diff --git a/src/plugins/multimedia/android/common/qandroidvideosink_p.h b/src/plugins/multimedia/android/common/qandroidvideosink_p.h index d653234f1..9afc58f65 100644 --- a/src/plugins/multimedia/android/common/qandroidvideosink_p.h +++ b/src/plugins/multimedia/android/common/qandroidvideosink_p.h @@ -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 #ifndef QANDROIDVIDEOSINK_P_H #define QANDROIDVIDEOSINK_P_H |