summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVaL Doroshchuk <valentyn.doroshchuk@qt.io>2020-06-22 15:52:59 +0200
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2020-06-24 21:22:06 +0000
commit6b88fadec90fd82ad1ad87533c59a54baa9df695 (patch)
tree9323139d6b7e497623b82c151f652aab5801f7a3
parente03b89d72e1fd16c099e12e5dfaaf9906a162ebc (diff)
Quick: Remove EGL video node
Not supported in RHI Change-Id: Iad0a360c9378ffbfe57070881fc94d807b3d1235 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--src/plugins/videonode/egl/egl.json3
-rw-r--r--src/plugins/videonode/egl/egl.pro18
-rw-r--r--src/plugins/videonode/egl/qsgvideonode_egl.cpp246
-rw-r--r--src/plugins/videonode/egl/qsgvideonode_egl.h108
-rw-r--r--src/plugins/videonode/videonode.pro2
5 files changed, 0 insertions, 377 deletions
diff --git a/src/plugins/videonode/egl/egl.json b/src/plugins/videonode/egl/egl.json
deleted file mode 100644
index 54a0519f5..000000000
--- a/src/plugins/videonode/egl/egl.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "Keys": ["egl"]
-}
diff --git a/src/plugins/videonode/egl/egl.pro b/src/plugins/videonode/egl/egl.pro
deleted file mode 100644
index 7151123ea..000000000
--- a/src/plugins/videonode/egl/egl.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TARGET = eglvideonode
-
-QT += multimedia-private qtmultimediaquicktools-private
-CONFIG += egl
-
-HEADERS += \
- qsgvideonode_egl.h
-
-SOURCES += \
- qsgvideonode_egl.cpp
-
-OTHER_FILES += \
- egl.json
-
-PLUGIN_TYPE = video/videonode
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL
-load(qt_plugin)
diff --git a/src/plugins/videonode/egl/qsgvideonode_egl.cpp b/src/plugins/videonode/egl/qsgvideonode_egl.cpp
deleted file mode 100644
index c3694f533..000000000
--- a/src/plugins/videonode/egl/qsgvideonode_egl.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla 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$
-**
-****************************************************************************/
-
-#include "qsgvideonode_egl.h"
-
-#include <QtMultimedia/qvideosurfaceformat.h>
-
-#include <GLES2/gl2ext.h>
-
-QT_BEGIN_NAMESPACE
-
-class QSGVideoMaterial_EGLShader : public QSGMaterialShader
-{
-public:
- void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
- char const *const *attributeNames() const;
-
- static QSGMaterialType type;
-
-protected:
- void initialize();
-
- const char *vertexShader() const;
- const char *fragmentShader() const;
-
-private:
- int id_matrix;
- int id_opacity;
- int id_texture;
-};
-
-void QSGVideoMaterial_EGLShader::updateState(
- const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
-{
- QSGVideoMaterial_EGL *material = static_cast<QSGVideoMaterial_EGL *>(newEffect);
- if (!oldEffect) {
- program()->setUniformValue(id_texture, 0);
- }
-
- if (state.isMatrixDirty()) {
- program()->setUniformValue(id_matrix, state.combinedMatrix());
- }
-
- if (state.isOpacityDirty()) {
- program()->setUniformValue(id_opacity, state.opacity());
- }
-
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_EXTERNAL_OES, material->m_textureId);
-}
-
-char const *const *QSGVideoMaterial_EGLShader::attributeNames() const
-{
- static char const *const attr[] = { "position", "texcoord", 0 };
- return attr;
-}
-
-QSGMaterialType QSGVideoMaterial_EGLShader::type;
-
-void QSGVideoMaterial_EGLShader::initialize()
-{
- id_matrix = program()->uniformLocation("matrix");
- id_opacity = program()->uniformLocation("opacity");
- id_texture = program()->uniformLocation("texture");
-}
-
-const char *QSGVideoMaterial_EGLShader::vertexShader() const
-{
- return "\n uniform highp mat4 matrix;"
- "\n attribute highp vec4 position;"
- "\n attribute highp vec2 texcoord;"
- "\n varying highp vec2 frag_tx;"
- "\n void main(void)"
- "\n {"
- "\n gl_Position = matrix * position;"
- "\n frag_tx = texcoord;"
- "\n }";
-}
-
-const char *QSGVideoMaterial_EGLShader::fragmentShader() const
-{
- return "\n #extension GL_OES_EGL_image_external : require"
- "\n uniform samplerExternalOES texture;"
- "\n varying highp vec2 frag_tx;"
- "\n void main(void)"
- "\n {"
- "\n gl_FragColor = texture2D(texture, frag_tx.st);"
- "\n }";
-}
-
-QSGVideoMaterial_EGL::QSGVideoMaterial_EGL()
- : m_image(0)
- , m_textureId(0)
-{
-}
-
-QSGVideoMaterial_EGL::~QSGVideoMaterial_EGL()
-{
- if (m_textureId) {
- glDeleteTextures(1, &m_textureId);
- m_textureId = 0;
- }
-}
-
-QSGMaterialShader *QSGVideoMaterial_EGL::createShader() const
-{
- return new QSGVideoMaterial_EGLShader;
-}
-
-QSGMaterialType *QSGVideoMaterial_EGL::type() const
-{
- return &QSGVideoMaterial_EGLShader::type;
-}
-
-int QSGVideoMaterial_EGL::compare(const QSGMaterial *other) const
-{
- return m_textureId - static_cast<const QSGVideoMaterial_EGL *>(other)->m_textureId;
-}
-
-void QSGVideoMaterial_EGL::setImage(EGLImageKHR image)
-{
- static const PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES
- = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
-
- if (m_image == image || !glEGLImageTargetTexture2DOES)
- return;
-
- m_image = image;
-
- if (!m_image) {
- if (m_textureId) {
- glDeleteTextures(1, &m_textureId);
- m_textureId = 0;
- }
- } else {
- if (!m_textureId) {
- glGenTextures(1, &m_textureId);
- glBindTexture(GL_TEXTURE_EXTERNAL_OES, m_textureId);
- glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- } else {
- glBindTexture(GL_TEXTURE_EXTERNAL_OES, m_textureId);
- }
- glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, m_image);
- }
-}
-
-QSGVideoNode_EGL::QSGVideoNode_EGL(const QVideoSurfaceFormat &format)
- : m_pixelFormat(format.pixelFormat())
-{
- setMaterial(&m_material);
-}
-
-QSGVideoNode_EGL::~QSGVideoNode_EGL()
-{
-}
-
-void QSGVideoNode_EGL::setCurrentFrame(const QVideoFrame &frame, FrameFlags)
-{
- EGLImageKHR image = frame.handle().value<void *>();
- m_material.setImage(image);
- markDirty(DirtyMaterial);
-}
-
-QVideoFrame::PixelFormat QSGVideoNode_EGL::pixelFormat() const
-{
- return m_pixelFormat;
-}
-
-QAbstractVideoBuffer::HandleType QSGVideoNode_EGL::handleType() const
-{
- return QAbstractVideoBuffer::EGLImageHandle;
-}
-
-static bool isExtensionSupported()
-{
- static const bool supported = eglGetProcAddress("glEGLImageTargetTexture2DOES");
- return supported;
-}
-
-QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_EGL::supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType) const
-{
- if (handleType != QAbstractVideoBuffer::EGLImageHandle || !isExtensionSupported())
- return QList<QVideoFrame::PixelFormat>();
-
- return QList<QVideoFrame::PixelFormat>()
- << QVideoFrame::Format_Invalid
- << QVideoFrame::Format_YV12
- << QVideoFrame::Format_UYVY
- << QVideoFrame::Format_NV21
- << QVideoFrame::Format_YUYV
- << QVideoFrame::Format_RGB32
- << QVideoFrame::Format_BGR32
- << QVideoFrame::Format_RGB24
- << QVideoFrame::Format_BGR24
- << QVideoFrame::Format_RGB565
- << QVideoFrame::Format_BGR565;
-}
-
-QSGVideoNode *QSGVideoNodeFactory_EGL::createNode(const QVideoSurfaceFormat &format)
-{
- return format.handleType() == QAbstractVideoBuffer::EGLImageHandle && isExtensionSupported()
- ? new QSGVideoNode_EGL(format)
- : 0;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/videonode/egl/qsgvideonode_egl.h b/src/plugins/videonode/egl/qsgvideonode_egl.h
deleted file mode 100644
index f83231e53..000000000
--- a/src/plugins/videonode/egl/qsgvideonode_egl.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla 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$
-**
-****************************************************************************/
-
-#ifndef EGLVIDEONODE_H
-#define EGLVIDEONODE_H
-
-#include <private/qsgvideonode_p.h>
-
-#include <QSGOpaqueTextureMaterial>
-#include <QSGTexture>
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-#ifdef Bool
-# undef Bool
-#endif
-#ifdef None
-# undef None
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QSGVideoMaterial_EGL : public QSGMaterial
-{
-public:
- QSGVideoMaterial_EGL();
- ~QSGVideoMaterial_EGL();
-
- QSGMaterialShader *createShader() const;
- QSGMaterialType *type() const;
- int compare(const QSGMaterial *other) const;
-
- void setImage(EGLImageKHR image);
-
-private:
- friend class QSGVideoMaterial_EGLShader;
-
- QRectF m_subrect;
- EGLImageKHR m_image;
- GLuint m_textureId;
-};
-
-class QSGVideoNode_EGL : public QSGVideoNode
-{
-public:
- QSGVideoNode_EGL(const QVideoSurfaceFormat &format);
- ~QSGVideoNode_EGL();
-
- void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags);
- QVideoFrame::PixelFormat pixelFormat() const;
- QAbstractVideoBuffer::HandleType handleType() const;
-
-private:
- QSGVideoMaterial_EGL m_material;
- QVideoFrame::PixelFormat m_pixelFormat;
-};
-
-class QSGVideoNodeFactory_EGL : public QSGVideoNodeFactoryPlugin
-{
- Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.qt.sgvideonodefactory/5.2" FILE "egl.json")
-public:
- QList<QVideoFrame::PixelFormat> supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType) const;
- QSGVideoNode *createNode(const QVideoSurfaceFormat &format);
-};
-
-QT_END_NAMESPACE
-
-#endif
-
diff --git a/src/plugins/videonode/videonode.pro b/src/plugins/videonode/videonode.pro
index ab7295406..b8bd43329 100644
--- a/src/plugins/videonode/videonode.pro
+++ b/src/plugins/videonode/videonode.pro
@@ -4,5 +4,3 @@ QT_FOR_CONFIG += gui-private multimedia-private
qtConfig(gpu_vivante) {
SUBDIRS += imx6
}
-
-qtConfig(egl):qtConfig(opengles2):!android: SUBDIRS += egl