diff options
Diffstat (limited to 'src/plugins/videonode/imx6/qsgvivantevideomaterial.h')
-rw-r--r-- | src/plugins/videonode/imx6/qsgvivantevideomaterial.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h index 227bc633c..faefa1c98 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2014 Pelagicore AG -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -41,6 +41,7 @@ #include <QVideoFrame> #include <QMutex> +#include <private/qsgvideonode_p.h> class QSGVivanteVideoMaterial : public QSGMaterial { @@ -52,7 +53,7 @@ public: virtual QSGMaterialShader *createShader() const; virtual int compare(const QSGMaterial *other) const; void updateBlending(); - void setCurrentFrame(const QVideoFrame &frame); + void setCurrentFrame(const QVideoFrame &frame, QSGVideoNode::FrameFlags flags); void bind(); GLuint vivanteMapping(QVideoFrame texIdVideoFramePair); @@ -60,6 +61,8 @@ public: void setOpacity(float o) { mOpacity = o; } private: + void clearTextures(); + qreal mOpacity; int mWidth; @@ -69,8 +72,12 @@ private: QMap<const uchar*, GLuint> mBitsToTextureMap; QVideoFrame mCurrentFrame, mNextFrame; GLuint mCurrentTexture; + bool mMappable; QMutex mFrameMutex; + + GLuint mTexDirectTexture; + GLvoid *mTexDirectPlanes[3]; }; #endif // QSGVIDEOMATERIAL_VIVMAP_H |