Merge lp:~phablet-team/qtvideo-node/support_qt52 into lp:qtvideo-node

[Timo Jyrinki]

Initial Qt 5.2 support. Copy two header files from qtmultimedia private headers. Only use Qt Declarative private headers (quick-private) otherwise, and use version detection to support both 5.0 and 5.2.

Disable unit tests temporarily.

[Timo Jyrinki (timo-jyrinki)]

See the bug comments. This revision 44 has tested to be building against Qt 5.2, but with the disabled tests:
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3883608/+listing-archive-extra

[Ricardo Salveti (rsalveti)]

What is the reason to disable the tests?

[Jim Hodapp (jhodapp)]

Looks good, thanks.

review: Approve (code)

[lp:~phablet-team/qtvideo-node/support_qt52]

45. By Ricardo Salveti on 2014-02-26

Merging lp:~sergiusens/qtvideo-node/qsgvideonode_p

46. By Ricardo Salveti on 2014-02-26

videonode.pro: adding back the unit tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/qtvideo-node-ci/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-trusty-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-trusty-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-trusty-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtvideo-node-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/qtvideo-node/support_qt52]

47. By Ricardo Salveti on 2014-02-27

Adding needed files for the unittests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/qtvideo-node-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtvideo-node-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtvideo-node-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/qtvideo-node-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtvideo-node-trusty-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtvideo-node-ci/45/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Approving as per functionality testing, builds in the PPA and camera works now!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-12-23 20:26:24 +0000
+++ debian/control	2014-02-27 03:41:33 +0000
@@ -15,7 +15,6 @@
                qtdeclarative5-dev,
                qtdeclarative5-private-dev,
                qtmultimedia5-dev,
-               qtmultimedia5-private-dev,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/qtvideo-node
 # If you aren't a member of ~phablet-team but need to upload packaging changes,

=== added directory 'src/private'
=== added file 'src/private/qsgvideonode_p.h'
--- src/private/qsgvideonode_p.h	1970-01-01 00:00:00 +0000
+++ src/private/qsgvideonode_p.h	2014-02-27 03:41:33 +0000
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 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.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: 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
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSGVIDEONODE_P_H
+#define QSGVIDEONODE_P_H
+
+#include <QtQuick/qsgnode.h>
+#include <private/qtmultimediaquickdefs_p.h>
+
+#include <QtMultimedia/qvideoframe.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
+#include <QtGui/qopenglfunctions.h>
+
+QT_BEGIN_NAMESPACE
+
+const QLatin1String QSGVideoNodeFactoryPluginKey("sgvideonodes");
+
+class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNode : public QSGGeometryNode
+{
+public:
+    QSGVideoNode();
+
+    virtual void setCurrentFrame(const QVideoFrame &frame) = 0;
+    virtual QVideoFrame::PixelFormat pixelFormat() const = 0;
+
+    void setTexturedRectGeometry(const QRectF &boundingRect, const QRectF &textureRect, int orientation);
+
+private:
+    QRectF m_rect;
+    QRectF m_textureRect;
+    int m_orientation;
+};
+
+class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryInterface
+{
+public:
+    virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const = 0;
+    virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0;
+};
+
+#define QSGVideoNodeFactoryInterface_iid "org.qt-project.qt.sgvideonodefactory/5.0"
+Q_DECLARE_INTERFACE(QSGVideoNodeFactoryInterface, QSGVideoNodeFactoryInterface_iid)
+
+class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryPlugin : public QObject, public QSGVideoNodeFactoryInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QSGVideoNodeFactoryInterface)
+public:
+    virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const = 0;
+    virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0;
+};
+
+QT_END_NAMESPACE
+
+#endif // QSGVIDEONODE_H

=== added file 'src/private/qtmultimediaquickdefs_p.h'
--- src/private/qtmultimediaquickdefs_p.h	1970-01-01 00:00:00 +0000
+++ src/private/qtmultimediaquickdefs_p.h	2014-02-27 03:41:33 +0000
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 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.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: 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
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QMULTIMEDIAQUICKDEFS_P_H
+#define QMULTIMEDIAQUICKDEFS_P_H
+
+#include <QtCore/qglobal.h>
+
+#ifndef QT_STATIC
+#    if defined(QT_BUILD_QTMM_QUICK_LIB)
+#        define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT
+#    else
+#        define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define Q_MULTIMEDIAQUICK_EXPORT
+#endif
+
+
+#endif // QMULTIMEDIAQUICKDEFS_P_H
+

=== added file 'src/qsgvideonode_p.cpp'
--- src/qsgvideonode_p.cpp	1970-01-01 00:00:00 +0000
+++ src/qsgvideonode_p.cpp	2014-02-27 03:41:33 +0000
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 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.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: 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
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "private/qsgvideonode_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QSGVideoNode::QSGVideoNode()
+    : m_orientation(-1)
+{
+}
+
+/* Helpers */
+static inline void qSetGeom(QSGGeometry::TexturedPoint2D *v, const QPointF &p)
+{
+    v->x = p.x();
+    v->y = p.y();
+}
+
+static inline void qSetTex(QSGGeometry::TexturedPoint2D *v, const QPointF &p)
+{
+    v->tx = p.x();
+    v->ty = p.y();
+}
+
+/* Update the vertices and texture coordinates.  Orientation must be in {0,90,180,270} */
+void QSGVideoNode::setTexturedRectGeometry(const QRectF &rect, const QRectF &textureRect, int orientation)
+{
+    if (rect == m_rect && textureRect == m_textureRect && orientation == m_orientation)
+        return;
+
+    m_rect = rect;
+    m_textureRect = textureRect;
+    m_orientation = orientation;
+
+    QSGGeometry *g = geometry();
+
+    if (g == 0)
+        g = new QSGGeometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4);
+
+    QSGGeometry::TexturedPoint2D *v = g->vertexDataAsTexturedPoint2D();
+
+    // Set geometry first
+    qSetGeom(v + 0, rect.topLeft());
+    qSetGeom(v + 1, rect.bottomLeft());
+    qSetGeom(v + 2, rect.topRight());
+    qSetGeom(v + 3, rect.bottomRight());
+
+    // and then texture coordinates
+    switch (orientation) {
+        default:
+            // tl, bl, tr, br
+            qSetTex(v + 0, textureRect.topLeft());
+            qSetTex(v + 1, textureRect.bottomLeft());
+            qSetTex(v + 2, textureRect.topRight());
+            qSetTex(v + 3, textureRect.bottomRight());
+            break;
+
+        case 90:
+            // tr, tl, br, bl
+            qSetTex(v + 0, textureRect.topRight());
+            qSetTex(v + 1, textureRect.topLeft());
+            qSetTex(v + 2, textureRect.bottomRight());
+            qSetTex(v + 3, textureRect.bottomLeft());
+            break;
+
+        case 180:
+            // br, tr, bl, tl
+            qSetTex(v + 0, textureRect.bottomRight());
+            qSetTex(v + 1, textureRect.topRight());
+            qSetTex(v + 2, textureRect.bottomLeft());
+            qSetTex(v + 3, textureRect.topLeft());
+            break;
+
+        case 270:
+            // bl, br, tl, tr
+            qSetTex(v + 0, textureRect.bottomLeft());
+            qSetTex(v + 1, textureRect.bottomRight());
+            qSetTex(v + 2, textureRect.topLeft());
+            qSetTex(v + 3, textureRect.topRight());
+            break;
+    }
+
+    if (!geometry())
+        setGeometry(g);
+
+    markDirty(DirtyGeometry);
+}
+
+QT_END_NAMESPACE

=== modified file 'src/shadervideomaterial.h'
--- src/shadervideomaterial.h	2013-12-05 16:48:46 +0000
+++ src/shadervideomaterial.h	2014-02-27 03:41:33 +0000
@@ -17,7 +17,12 @@
 #ifndef SHADERVIDEOMATERIAL_H
 #define SHADERVIDEOMATERIAL_H
 
+#include <qglobal.h>
+#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
 #include <QSGMaterial>
+#else
+#include <QtQuick/QSGMaterial>
+#endif
 #include <QVideoSurfaceFormat>
 #include <qgl.h>
 

=== modified file 'src/shadervideoshader.h'
--- src/shadervideoshader.h	2013-02-12 14:04:56 +0000
+++ src/shadervideoshader.h	2014-02-27 03:41:33 +0000
@@ -17,7 +17,12 @@
 #ifndef SHADERVIDEOSHADER_H
 #define SHADERVIDEOSHADER_H
 
+#include <qglobal.h>
+#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
 #include <QSGMaterialShader>
+#else
+#include <QtQuick/QSGMaterialShader>
+#endif
 #include <QVideoFrame>
 
 class ShaderVideoShader : public QSGMaterialShader

=== modified file 'src/src.pro'
--- src/src.pro	2013-06-05 11:44:20 +0000
+++ src/src.pro	2014-02-27 03:41:33 +0000
@@ -1,7 +1,7 @@
 TARGET = shadervideonode
 TEMPLATE = lib
 CONFIG += plugin
-QT += multimedia-private qtmultimediaquicktools-private opengl
+QT += multimedia opengl quick-private
 
 include(../coverage.pri)
 
@@ -27,4 +27,5 @@
     shadervideomaterial.cpp \
     shadervideoshader.cpp \
     shadervideonode.cpp \
-    snapshotgenerator.cpp
+    snapshotgenerator.cpp \
+    qsgvideonode_p.cpp

=== modified file 'unittests/shadervideonode/shadervideonode.pro'
--- unittests/shadervideonode/shadervideonode.pro	2013-09-10 13:28:07 +0000
+++ unittests/shadervideonode/shadervideonode.pro	2014-02-27 03:41:33 +0000
@@ -7,7 +7,7 @@
 
 include(../../coverage.pri)
 
-QT += testlib multimedia-private qtmultimediaquicktools-private opengl
+QT += testlib multimedia opengl quick-private
 
 # This is to avoid a segfault in shadervideonode.cpp when it tries to call
 # glGenTextures(), since the platform currently does not support real OpenGL
@@ -19,6 +19,7 @@
     ../../src/shadervideonode.cpp \
     ../../src/shadervideoshader.cpp \
     ../../src/snapshotgenerator.cpp \
+    ../../src/qsgvideonode_p.cpp \
     camera.cpp \
     player.cpp
 
@@ -26,6 +27,8 @@
     ../../src/shadervideonode.h \
     ../../src/shadervideoshader.h \
     ../../src/snapshotgenerator.h \
+    ../../src/private/qtmultimediaquickdefs_p.h \
+    ../../src/private/qsgvideonode_p.h \
     camera_compatibility_layer.h \
     media_compatibility_layer.h \
     surface_texture_client_hybris.h