Merge lp:~timo-jyrinki/qtvideo-node/port_to_qt55 into lp:qtvideo-node

[Timo Jyrinki]

Port to Qt 5.5 to fix video playback (LP: #1474695)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/qtvideo-node-ci/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtvideo-node-vivid-i386-ci/10/console

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

=== modified file 'src/private/qtmultimediaquickdefs_p.h'
--- src/private/qtmultimediaquickdefs_p.h	2014-01-31 08:54:55 +0000
+++ src/private/qtmultimediaquickdefs_p.h	2015-10-08 07:11:57 +0000
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** 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.
+** 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
-** 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.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** 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.
 **
-** 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$
 **
 ****************************************************************************/

=== modified file 'src/qsgvideonode_p.cpp'
--- src/qsgvideonode_p.cpp	2014-06-06 14:54:20 +0000
+++ src/qsgvideonode_p.cpp	2015-10-08 07:11:57 +0000
@@ -1,45 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** 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.
+** 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
-** 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.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** 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.
 **
-** 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"
+#include "qsgvideonode_p.h"
 
 QT_BEGIN_NAMESPACE
 

=== renamed file 'src/private/qsgvideonode_p.h' => 'src/qsgvideonode_p.h'
--- src/private/qsgvideonode_p.h	2014-06-06 14:54:20 +0000
+++ src/qsgvideonode_p.h	2015-10-08 07:11:57 +0000
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** 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.
+** 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
-** 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.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** 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.
 **
-** 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$
 **
 ****************************************************************************/
@@ -51,15 +43,19 @@
 
 QT_BEGIN_NAMESPACE
 
-const QLatin1String QSGVideoNodeFactoryPluginKey("sgvideonodes");
-
 class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNode : public QSGGeometryNode
 {
 public:
+    enum FrameFlag {
+        FrameFiltered = 0x01
+    };
+    Q_DECLARE_FLAGS(FrameFlags, FrameFlag)
+
     QSGVideoNode();
 
-    virtual void setCurrentFrame(const QVideoFrame &frame) = 0;
+    virtual void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags) = 0;
     virtual QVideoFrame::PixelFormat pixelFormat() const = 0;
+    virtual QAbstractVideoBuffer::HandleType handleType() const = 0;
 
     void setTexturedRectGeometry(const QRectF &boundingRect, const QRectF &textureRect, int orientation);
 
@@ -69,6 +65,8 @@
     int m_orientation;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSGVideoNode::FrameFlags)
+
 class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryInterface
 {
 public:

=== modified file 'src/shadervideonode.cpp'
--- src/shadervideonode.cpp	2015-06-18 16:20:53 +0000
+++ src/shadervideonode.cpp	2015-10-08 07:11:57 +0000
@@ -69,7 +69,7 @@
  * back.
  * \param frame
  */
-void ShaderVideoNode::setCurrentFrame(const QVideoFrame &frame)
+void ShaderVideoNode::setCurrentFrame(const QVideoFrame &frame, FrameFlags flags)
 {
     void *ci = 0;
     if (frame.availableMetaData().contains("CamControl")) {
@@ -106,6 +106,15 @@
 }
 
 /*!
+ * \brief ShaderVideoNode::HandleType \reimp
+ * \return
+ */
+QAbstractVideoBuffer::HandleType ShaderVideoNode::handleType() const
+{
+    return QAbstractVideoBuffer::GLTextureHandle;
+}
+
+/*!
  * \brief ShaderVideoNode::onSetSnapshotSize sets the target size for the snapshot
  * \param size
  */

=== modified file 'src/shadervideonode.h'
--- src/shadervideonode.h	2015-04-30 19:42:40 +0000
+++ src/shadervideonode.h	2015-10-08 07:11:57 +0000
@@ -19,7 +19,7 @@
 
 #include <qgl.h>
 #include <QObject>
-#include <private/qsgvideonode_p.h>
+#include <qsgvideonode_p.h>
 
 #include <memory>
 
@@ -43,7 +43,8 @@
     void preprocess();
 
     QVideoFrame::PixelFormat pixelFormat() const;
-    void setCurrentFrame(const QVideoFrame &frame);
+    void setCurrentFrame(const QVideoFrame &frame, FrameFlags flags);
+    QAbstractVideoBuffer::HandleType handleType() const;
 
 private Q_SLOTS:
     void onSetSnapshotSize(const QSize &size);

=== modified file 'src/shadervideonodeplugin.h'
--- src/shadervideonodeplugin.h	2014-06-06 14:54:20 +0000
+++ src/shadervideonodeplugin.h	2015-10-08 07:11:57 +0000
@@ -17,7 +17,7 @@
 #ifndef SHADERVIDEONODEPLUGIN_H
 #define SHADERVIDEONODEPLUGIN_H
 
-#include <private/qsgvideonode_p.h>
+#include <qsgvideonode_p.h>
 #include <QVideoSurfaceFormat>
 
 class ShaderVideoNodePlugin : public QObject, public QSGVideoNodeFactoryInterface

=== modified file 'unittests/shadervideonode/tst_shadervideonode.cpp'
--- unittests/shadervideonode/tst_shadervideonode.cpp	2015-01-12 16:52:18 +0000
+++ unittests/shadervideonode/tst_shadervideonode.cpp	2015-10-08 07:11:57 +0000
@@ -117,12 +117,12 @@
     CameraControl *cc = new CameraControl;
     QVideoFrame frame(new GLTextureBuffer(1), QSize(320, 240), QVideoFrame::Format_RGB32);
 
-    node.setCurrentFrame(frame);
+    node.setCurrentFrame(frame, 0);
     QCOMPARE(QVariant(QMetaType::VoidStar, node.m_material->cameraControl()),
              QVariant(QMetaType::VoidStar, 0));
 
     frame.setMetaData("CamControl", QVariant::fromValue(static_cast<void*>(cc)));
-    node.setCurrentFrame(frame);
+    node.setCurrentFrame(frame, 0);
     QCOMPARE(QVariant(QMetaType::VoidStar, node.m_material->cameraControl()),
              QVariant(QMetaType::VoidStar, cc));
 }
@@ -136,12 +136,12 @@
 
     QVideoFrame frame(new GLTextureBuffer(1), QSize(1920, 80), QVideoFrame::Format_RGB32);
 
-    node.setCurrentFrame(frame);
+    node.setCurrentFrame(frame, 0);
 
     std::shared_ptr<core::ubuntu::media::video::Sink> sink{new NullSink()};
 
     frame.setMetaData("GLVideoSink", QVariant::fromValue(sink));
-    node.setCurrentFrame(frame);
+    node.setCurrentFrame(frame, 0);
     QCOMPARE(node.m_material->glVideoSink(), sink);
 
     QVERIFY(m_glConsumerSet == true);