diff options
Diffstat (limited to 'src/plugins/multimedia/android/common/qandroidvideooutput_p.h')
| -rw-r--r-- | src/plugins/multimedia/android/common/qandroidvideooutput_p.h | 157 |
1 files changed, 15 insertions, 142 deletions
diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput_p.h b/src/plugins/multimedia/android/common/qandroidvideooutput_p.h index 377f3a4eb..c59a1b76c 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 <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 |