Added qmlvideo and qmlvideofx demos

qmlvideo allows the user to select from a menu one of a number of
video or camera use cases.  These include scenes in which the Video
or Camera item is moved, resized, rotated etc.  This application
is intended to test the various manipulations which can be applied
to Video and Camera items.

qmlvideofx uses the ShaderEffectItem element to apply post-processing
effects, expressed in GLSL, to a Video or Camera item.

While the main body of each app is implemented in QML, each one also
makes use of native code in order to gather and calculate performance
metrics, namely the QML frame rate and (on Symbian only) the graphics
memory consumption.  These metrics are displayed in QML elements
which are overlaid on the UI.

qmlvideofx also demonstrates the use of different top-level QML files
to handle different screen sizes.  On small-screen devices, menus are
by default hidden, and only appear when summoned by a gesture.
Large-screen devices show a more traditional layout in which menus
are displayed around the video content pane.

Reviewed-by: Jonas Rabbe

171 files changed, 11623 insertions, 1 deletions

diff --git a/demos/demos.pro b/demos/demos.pro
index 7cd1023aee..a65b7700d5 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -5,7 +5,8 @@ TEMPLATE = subdirs
 #Multimedia demos
 contains(mobility_modules,multimedia) {
     SUBDIRS += \
-        player
+        player \
+        video
 }
 
 #Messaging demos
diff --git a/demos/video/qmlvideo/images/close.png b/demos/video/qmlvideo/images/close.png
new file mode 100644
index 0000000000..6904df0e44
--- /dev/null
+++ b/demos/video/qmlvideo/images/close.png
diff --git a/demos/video/qmlvideo/images/folder.png b/demos/video/qmlvideo/images/folder.png
new file mode 100644
index 0000000000..e53e2ad464
--- /dev/null
+++ b/demos/video/qmlvideo/images/folder.png
diff --git a/demos/video/qmlvideo/images/leaves.jpg b/demos/video/qmlvideo/images/leaves.jpg
new file mode 100644
index 0000000000..66533b34af
--- /dev/null
+++ b/demos/video/qmlvideo/images/leaves.jpg
diff --git a/demos/video/qmlvideo/images/progress_handle.svg b/demos/video/qmlvideo/images/progress_handle.svg
new file mode 100644
index 0000000000..7ad9014e31
--- /dev/null
+++ b/demos/video/qmlvideo/images/progress_handle.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10px"
+   height="46px"
+   version="1.1">
+    <g>
+        <defs>
+            <linearGradient id="MyGradient1" x1="0%" y1="0%" x2="100%" y2="100%">
+                <stop offset="0%" stop-color="lightcyan" />
+                <stop offset="100%" stop-color="dodgerblue" />
+            </linearGradient>
+        </defs>
+        <rect
+            stroke="white"
+            fill="url(#MyGradient1)"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            width="8"
+            height="44"
+            x="1"
+            y="1"
+            rx="4"
+            ry="4"/>
+    </g>
+</svg>
diff --git a/demos/video/qmlvideo/images/progress_handle_pressed.svg b/demos/video/qmlvideo/images/progress_handle_pressed.svg
new file mode 100644
index 0000000000..c9c6c486c6
--- /dev/null
+++ b/demos/video/qmlvideo/images/progress_handle_pressed.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10px"
+   height="46px"
+   version="1.1">
+    <g>
+        <defs>
+            <linearGradient id="MyGradient1" x1="0%" y1="0%" x2="100%" y2="100%">
+                <stop offset="0%" stop-color="skyblue" />
+                <stop offset="100%" stop-color="darkblue" />
+            </linearGradient>
+        </defs>
+        <rect
+            stroke="white"
+            fill="url(#MyGradient1)"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            width="8"
+            height="44"
+            x="1"
+            y="1"
+            rx="4"
+            ry="4"/>
+    </g>
+</svg>
diff --git a/demos/video/qmlvideo/images/titlebar.png b/demos/video/qmlvideo/images/titlebar.png
new file mode 100644
index 0000000000..51c90082d0
--- /dev/null
+++ b/demos/video/qmlvideo/images/titlebar.png
diff --git a/demos/video/qmlvideo/images/titlebar.sci b/demos/video/qmlvideo/images/titlebar.sci
new file mode 100644
index 0000000000..0418d94cd6
--- /dev/null
+++ b/demos/video/qmlvideo/images/titlebar.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png
diff --git a/demos/video/qmlvideo/images/up.png b/demos/video/qmlvideo/images/up.png
new file mode 100644
index 0000000000..b05f8025d0
--- /dev/null
+++ b/demos/video/qmlvideo/images/up.png
diff --git a/demos/video/qmlvideo/main.cpp b/demos/video/qmlvideo/main.cpp
new file mode 100644
index 0000000000..90222e8dbc
--- /dev/null
+++ b/demos/video/qmlvideo/main.cpp
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtGui/QApplication>
+#include <QtGui/QGraphicsObject>
+#include "qmlapplicationviewer.h"
+#include "trace.h"
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+#include "painteventmonitor.h"
+#include "performancemonitordeclarative.h"
+#endif
+
+static const QString DefaultFileName = "test.mp4";
+#ifdef Q_OS_SYMBIAN
+static const QString DefaultFileName1 = "e:/" + DefaultFileName;
+#elif MEEGO_EDITION_HARMATTAN
+static const QString DefaultFileName1 = "/home/developer/MyDocs/" + DefaultFileName;
+#else
+static const QString DefaultFileName1 = "";
+#endif
+static const QString DefaultFileName2 = "";
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    PerformanceMonitor::qmlRegisterTypes();
+#endif
+
+    QString source1, source2;
+    qreal volume = 0.5;
+    QStringList args = app.arguments();
+    PerformanceMonitor::State performanceMonitorState;
+    bool sourceIsUrl = false;
+    for (int i=1; i<args.count(); ++i) {
+        const QString &arg = args.at(i);
+        if (arg.startsWith('-')) {
+            if ("-volume" == arg) {
+                if (i+1 < args.count())
+                    volume = 0.01 * args.at(++i).toInt();
+                else
+                    qtTrace() << "Option \"-volume\" takes a value";
+            }
+#ifdef PERFORMANCEMONITOR_SUPPORT
+            else if (PerformanceMonitor::parseArgument(arg, performanceMonitorState)) {
+                // Do nothing
+            }
+#endif
+            else if ("-url" == arg) {
+                sourceIsUrl = true;
+            } else {
+                qtTrace() << "Option" << arg << "ignored";
+            }
+        } else {
+            if (source1.isEmpty())
+                source1 = arg;
+            else if (source2.isEmpty())
+                source2 = arg;
+            else
+                qtTrace() << "Argument" << arg << "ignored";
+        }
+    }
+
+    QUrl url1, url2;
+    if (source1.isEmpty()) {
+        url1 = QUrl::fromLocalFile(DefaultFileName1);
+    } else {
+        if (sourceIsUrl)
+            url1 = source1;
+        else
+            url1 = QUrl::fromLocalFile(source1);
+    }
+    if (source2.isEmpty()) {
+        url2 = QUrl::fromLocalFile(DefaultFileName2);
+    } else {
+        if (sourceIsUrl)
+            url2 = source2;
+        else
+            url2 = QUrl::fromLocalFile(source2);
+    }
+
+    QmlApplicationViewer viewer;
+
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
+    viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml"));
+    QGraphicsObject *rootObject = viewer.rootObject();
+    rootObject->setProperty("source1", url1);
+    rootObject->setProperty("source2", url2);
+    rootObject->setProperty("volume", volume);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    if (performanceMonitorState.valid) {
+        rootObject->setProperty("perfMonitorsLogging", performanceMonitorState.logging);
+        rootObject->setProperty("perfMonitorsVisible", performanceMonitorState.visible);
+    }
+    PaintEventMonitor paintEventMonitor;
+    paintEventMonitor.setTarget(viewer.viewport());
+    QObject::connect(&paintEventMonitor, SIGNAL(targetPainted()),
+                     rootObject, SLOT(qmlFramePainted()));
+#endif
+
+    QMetaObject::invokeMethod(rootObject, "init");
+
+    viewer.showExpanded();
+
+    return app.exec();
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/Button.qml b/demos/video/qmlvideo/qml/qmlvideo/Button.qml
new file mode 100644
index 0000000000..dfff92e503
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/Button.qml
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: textColor
+    radius: 0.25 * height
+
+    property string text
+    property color bgColor: "white"
+    property color bgColorSelected: "red"
+    property color textColor: "black"
+    property alias enabled: mouseArea.enabled
+
+    signal clicked
+
+    Rectangle {
+        anchors { fill: parent; margins: 1 }
+        color: mouseArea.pressed ? bgColorSelected : bgColor
+        radius: 0.25 * height
+
+        Text {
+            id: text
+            anchors.centerIn: parent
+            text: root.text
+            font.pixelSize: 0.5 * parent.height
+            color: mouseArea.pressed ? bgColor : textColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        MouseArea {
+            id: mouseArea
+            anchors.fill: parent
+            onClicked: {
+                root.clicked()
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraBasic.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
new file mode 100644
index 0000000000..24888ebe5d
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneBasic {
+    contentType: "camera"
+    started: true
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraDrag.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
new file mode 100644
index 0000000000..cd05e91913
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneDrag {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraDummy.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
new file mode 100644
index 0000000000..68bbb4af83
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+// Item which is loaded by CameraItem if QtMultimediaKit is not available
+Rectangle {
+    id: root
+    color: "grey"
+    height: width
+
+    signal fatalError
+    signal sizeChanged
+    signal framePainted
+
+    Text {
+        anchors.fill: parent
+        anchors.margins: 10
+        color: "white"
+        horizontalAlignment: Text.AlignHCenter
+        text: "Failed to create Camera item\n\nCheck that QtMultimediaKit is installed"
+        verticalAlignment: Text.AlignVCenter
+        wrapMode: Text.Wrap
+    }
+
+    onWidthChanged: height = width
+    onHeightChanged: root.sizeChanged()
+
+    function start() { }
+    function stop() { }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
new file mode 100644
index 0000000000..11ee76b05f
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreen {
+    contentType: "camera"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
new file mode 100644
index 0000000000..d9341528c9
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreenInverted {
+    contentType: "camera"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraItem.qml
new file mode 100644
index 0000000000..dc140703dc
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraItem.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Camera {
+    id: root
+    height: width
+
+    signal fatalError
+    signal sizeChanged
+
+    onHeightChanged: root.sizeChanged()
+    onError: {
+        if (Camera.NoError != error) {
+            console.log("[qmlvideo] CameraItem.onError error " + error + " errorString " + errorString)
+            root.fatalError()
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraMove.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraMove.qml
new file mode 100644
index 0000000000..ef3a99b237
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraMove.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneMove {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
new file mode 100644
index 0000000000..b97030d8ff
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneOverlay {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraResize.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraResize.qml
new file mode 100644
index 0000000000..9baabbc297
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraResize.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneResize {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraRotate.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
new file mode 100644
index 0000000000..f969661016
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneRotate {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraSpin.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
new file mode 100644
index 0000000000..e63256cbcd
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneSpin {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/Content.qml b/demos/video/qmlvideo/qml/qmlvideo/Content.qml
new file mode 100644
index 0000000000..cc7b20e617
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/Content.qml
@@ -0,0 +1,159 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    border.color: "white"
+    border.width: showBorder ? 1 : 0
+    color: "transparent"
+    property string contentType // "camera" or "video"
+    property string source
+    property real volume
+    property bool dummy: false
+    property bool autoStart: true
+    property bool started: false
+    property bool showFrameRate: false
+    property bool showBorder: false
+
+    signal initialized
+    signal error
+    signal videoFramePainted
+
+    Loader {
+        id: contentLoader
+    }
+
+    Connections {
+        id: framePaintedConnection
+        onFramePainted: {
+            if (frameRateLoader.item)
+                frameRateLoader.item.notify()
+            root.videoFramePainted()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    Connections {
+        id: errorConnection
+        onFatalError: {
+            console.log("[qmlvideo] Content.onFatalError")
+            stop()
+            root.error()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    Loader {
+        id: frameRateLoader
+        source: root.showFrameRate ? "../frequencymonitor/FrequencyItem.qml" : ""
+        onLoaded: {
+            item.parent = root
+            item.anchors.top = root.top
+            item.anchors.right = root.right
+            item.anchors.margins = 10
+        }
+    }
+
+    onWidthChanged: {
+        if (contentItem())
+            contentItem().width = width
+    }
+
+    onHeightChanged: {
+        if (contentItem())
+            contentItem().height = height
+    }
+
+    function initialize() {
+        console.log("[qmlvideo] Content.initialize: contentType " + contentType)
+        if ("video" == contentType) {
+            console.log("[qmlvideo] Content.initialize: loading VideoItem.qml")
+            contentLoader.source = "VideoItem.qml"
+            if (Loader.Error == contentLoader.status) {
+                console.log("[qmlvideo] Content.initialize: loading VideoDummy.qml")
+                contentLoader.source = "VideoDummy.qml"
+                dummy = true
+            }
+            contentLoader.item.volume = volume
+        } else if ("camera" == contentType) {
+            console.log("[qmlvideo] Content.initialize: loading CameraItem.qml")
+            contentLoader.source = "CameraItem.qml"
+            if (Loader.Error == contentLoader.status) {
+                console.log("[qmlvideo] Content.initialize: loading CameraDummy.qml")
+                contentLoader.source = "CameraDummy.qml"
+                dummy = true
+            }
+        } else {
+            console.log("[qmlvideo] Content.initialize: error: invalid contentType")
+        }
+        if (contentLoader.item) {
+            contentLoader.item.sizeChanged.connect(updateRootSize)
+            contentLoader.item.parent = root
+            contentLoader.item.width = root.width
+            framePaintedConnection.target = contentLoader.item
+            errorConnection.target = contentLoader.item
+            if (root.autoStart)
+                root.start()
+        }
+        console.log("[qmlvideo] Content.initialize: complete")
+        root.initialized()
+    }
+
+    function start() {
+        console.log("[qmlvideo] Content.start")
+        if (contentLoader.item) {
+            if (root.contentType == "video")
+                contentLoader.item.source = root.source
+            contentLoader.item.start()
+            root.started = true
+        }
+    }
+
+    function stop() {
+        console.log("[qmlvideo] Content.stop")
+        if (contentLoader.item) {
+            contentLoader.item.stop()
+            if (root.contentType == "video")
+                contentLoader.item.source = ""
+            root.started = false
+        }
+    }
+
+    function contentItem() { return contentLoader.item }
+    function updateRootSize() { root.height = contentItem().height }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml b/demos/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
new file mode 100644
index 0000000000..1e73b9a3a9
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMobility.systeminfo 1.1
+
+Item {
+    ScreenSaver {
+        screenSaverInhibited: true
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/demos/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
new file mode 100644
index 0000000000..69141007bd
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
@@ -0,0 +1,349 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.folderlistmodel 1.0
+
+Rectangle {
+    id: root
+    color: "white"
+    property bool showFocusHighlight: false
+    property variant folders: folders1
+    property variant view: view1
+    property alias folder: folders1.folder
+    property color textColor: "black"
+
+    signal openFile(string path)
+
+    FolderListModel {
+        id: folders1
+        folder: folder
+    }
+
+    FolderListModel {
+        id: folders2
+        folder: folder
+    }
+
+    SystemPalette {
+        id: palette
+    }
+
+    Component {
+        id: folderDelegate
+
+        Rectangle {
+            id: wrapper
+            function launch() {
+                if (folders.isFolder(index))
+                    down(filePath);
+                else
+                    root.openFile(filePath);
+            }
+            width: root.width
+            height: 52
+            color: "transparent"
+
+            Rectangle {
+                id: highlight; visible: false
+                anchors.fill: parent
+                color: palette.highlight
+                gradient: Gradient {
+                    GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                    GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                }
+            }
+
+            Item {
+                width: 48; height: 48
+                Image {
+                    source: "qrc:/images/folder.png"
+                    anchors.centerIn: parent
+                    visible: folders.isFolder(index)
+                }
+            }
+
+            Text {
+                id: nameText
+                anchors.fill: parent; verticalAlignment: Text.AlignVCenter
+                text: fileName
+                anchors.leftMargin: 54
+                font.pixelSize: 32
+                color: (wrapper.ListView.isCurrentItem && root.showFocusHighlight) ? palette.highlightedText : textColor
+                elide: Text.ElideRight
+            }
+
+            MouseArea {
+                id: mouseRegion
+                anchors.fill: parent
+                onPressed: {
+                    root.showFocusHighlight = false;
+                    wrapper.ListView.view.currentIndex = index;
+                }
+                onClicked: { if (folders == wrapper.ListView.view.model) launch() }
+            }
+
+            states: [
+                State {
+                    name: "pressed"
+                    when: mouseRegion.pressed
+                    PropertyChanges { target: highlight; visible: true }
+                    PropertyChanges { target: nameText; color: palette.highlightedText }
+                }
+            ]
+        }
+    }
+
+    Rectangle {
+        id: cancelButton
+        width: 100
+        height: titleBar.height - 7
+        color: "black"
+        anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter }
+
+        Text {
+            anchors { fill: parent; margins: 4 }
+            text: "Cancel"
+            color: "white"
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            font.pixelSize: 20
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.openFile("")
+        }
+    }
+
+    ListView {
+        id: view1
+        anchors.top: titleBar.bottom
+        anchors.bottom: cancelButton.top
+        x: 0
+        width: parent.width
+        model: folders1
+        delegate: folderDelegate
+        highlight: Rectangle {
+            color: palette.highlight
+            visible: root.showFocusHighlight && view1.count != 0
+            gradient: Gradient {
+                GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+            }
+            width: view1.currentItem == null ? 0 : view1.currentItem.width
+        }
+        highlightMoveSpeed: 1000
+        pressDelay: 100
+        focus: true
+        state: "current"
+        states: [
+            State {
+                name: "current"
+                PropertyChanges { target: view1; x: 0 }
+            },
+            State {
+                name: "exitLeft"
+                PropertyChanges { target: view1; x: -root.width }
+            },
+            State {
+                name: "exitRight"
+                PropertyChanges { target: view1; x: root.width }
+            }
+        ]
+        transitions: [
+            Transition {
+                to: "current"
+                SequentialAnimation {
+                    NumberAnimation { properties: "x"; duration: 250 }
+                }
+            },
+            Transition {
+                NumberAnimation { properties: "x"; duration: 250 }
+                NumberAnimation { properties: "x"; duration: 250 }
+            }
+        ]
+        Keys.onPressed: root.keyPressed(event.key)
+    }
+
+    ListView {
+        id: view2
+        anchors.top: titleBar.bottom
+        anchors.bottom: parent.bottom
+        x: parent.width
+        width: parent.width
+        model: folders2
+        delegate: folderDelegate
+        highlight: Rectangle {
+            color: palette.highlight
+            visible: root.showFocusHighlight && view2.count != 0
+            gradient: Gradient {
+                GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+            }
+            width: view1.currentItem == null ? 0 : view1.currentItem.width
+        }
+        highlightMoveSpeed: 1000
+        pressDelay: 100
+        states: [
+            State {
+                name: "current"
+                PropertyChanges { target: view2; x: 0 }
+            },
+            State {
+                name: "exitLeft"
+                PropertyChanges { target: view2; x: -root.width }
+            },
+            State {
+                name: "exitRight"
+                PropertyChanges { target: view2; x: root.width }
+            }
+        ]
+        transitions: [
+            Transition {
+                to: "current"
+                SequentialAnimation {
+                    NumberAnimation { properties: "x"; duration: 250 }
+                }
+            },
+            Transition {
+                NumberAnimation { properties: "x"; duration: 250 }
+            }
+        ]
+        Keys.onPressed: root.keyPressed(event.key)
+    }
+
+    Keys.onPressed: {
+        root.keyPressed(event.key);
+        if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
+            view.currentItem.launch();
+            event.accepted = true;
+        } else if (event.key == Qt.Key_Left) {
+            up();
+        }
+    }
+
+    BorderImage {
+        source: "qrc:/images/titlebar.sci";
+        width: parent.width;
+        height: 52
+        y: -7
+        id: titleBar
+
+        Rectangle {
+            id: upButton
+            width: 48
+            height: titleBar.height - 7
+            color: "transparent"
+            Image { anchors.centerIn: parent; source: "qrc:/images/up.png" }
+            MouseArea { id: upRegion; anchors.centerIn: parent
+                width: 56
+                height: 56
+                onClicked: if (folders.parentFolder != "") up()
+            }
+            states: [
+                State {
+                    name: "pressed"
+                    when: upRegion.pressed
+                    PropertyChanges { target: upButton; color: palette.highlight }
+                }
+            ]
+        }
+
+        Rectangle {
+            color: "gray"
+            x: 48
+            width: 1
+            height: 44
+        }
+
+        Text {
+            anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
+            anchors.leftMargin: 4; anchors.rightMargin: 4
+            text: folders.folder
+            color: "white"
+            elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
+            font.pixelSize: 32
+        }
+    }
+
+    function down(path) {
+        if (folders == folders1) {
+            view = view2
+            folders = folders2;
+            view1.state = "exitLeft";
+        } else {
+            view = view1
+            folders = folders1;
+            view2.state = "exitLeft";
+        }
+        view.x = root.width;
+        view.state = "current";
+        view.focus = true;
+        folders.folder = path;
+    }
+
+    function up() {
+        var path = folders.parentFolder;
+        if (folders == folders1) {
+            view = view2
+            folders = folders2;
+            view1.state = "exitRight";
+        } else {
+            view = view1
+            folders = folders1;
+            view2.state = "exitRight";
+        }
+        view.x = -root.width;
+        view.state = "current";
+        view.focus = true;
+        folders.folder = path;
+    }
+
+    function keyPressed(key) {
+        switch (key) {
+            case Qt.Key_Up:
+            case Qt.Key_Down:
+            case Qt.Key_Left:
+            case Qt.Key_Right:
+                root.showFocusHighlight = true;
+            break;
+            default:
+                // do nothing
+            break;
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/Scene.qml b/demos/video/qmlvideo/qml/qmlvideo/Scene.qml
new file mode 100644
index 0000000000..58c4b1213e
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/Scene.qml
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "black"
+    property alias buttonHeight: closeButton.height
+    property string source1
+    property string source2
+    property int contentWidth: 250
+    property real volume: 0.25
+    property int margins: 10
+    property QtObject content
+
+    signal close
+    signal videoFramePainted
+
+    Button {
+        id: closeButton
+        anchors {
+            top: parent.top
+            right: parent.right
+            margins: root.margins
+        }
+        width: 50
+        height: 30
+        z: 2.0
+        text: "Back"
+        onClicked: root.close()
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneBasic.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
new file mode 100644
index 0000000000..69e8343de3
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+    property bool autoStart: false
+    property bool started: false
+
+    Content {
+        id: content
+        autoStart: parent.autoStart
+        started: parent.started
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: parent.contentType
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Text {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: 20
+        }
+        text: content.started ? "Tap the screen to stop content"
+                              : "Tap the screen to start content"
+        color: "yellow"
+        font.pixelSize: 20
+        z: 2.0
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            console.log("[qmlvideo] SceneBasic.onClicked, started = " + content.started)
+            if (content.started)
+                content.stop()
+            else
+                content.start()
+        }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneDrag.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
new file mode 100644
index 0000000000..a981c3067c
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Image {
+        id: background
+        source: "qrc:/images/leaves.jpg"
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+
+        Content {
+            id: content
+            anchors.centerIn: parent
+            width: root.contentWidth
+            contentType: root.contentType
+            source: root.source1
+            volume: root.volume
+            onVideoFramePainted: root.videoFramePainted()
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        drag.target: background
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
new file mode 100644
index 0000000000..c844b6fda3
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        state: "left"
+
+        states: [
+            State {
+                name: "fullScreen"
+                PropertyChanges { target: content; width: content.parent.width }
+                PropertyChanges { target: content; height: content.parent.height }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                ParallelAnimation {
+                    PropertyAnimation {
+                        property: "width"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                    PropertyAnimation {
+                        property: "height"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                }
+            }
+        ]
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: content.state = (content.state == "fullScreen") ? "baseState" : "fullScreen"
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Text {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: 20
+        }
+        text: "Tap on the content to toggle full-screen mode"
+        color: "yellow"
+        font.pixelSize: 20
+        z: 2.0
+    }
+
+    Component.onCompleted: root.content = content
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
new file mode 100644
index 0000000000..238daacd13
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.width
+        height: parent.height
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        state: "left"
+
+        states: [
+            State {
+                name: "nonFullScreen"
+                PropertyChanges { target: content; width: content.parent.contentWidth }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                ParallelAnimation {
+                    PropertyAnimation {
+                        property: "width"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                    PropertyAnimation {
+                        property: "height"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                }
+            }
+        ]
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: content.state = (content.state == "nonFullScreen") ? "baseState" : "nonFullScreen"
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+
+        onInitialized: {
+            width = parent.width
+            height = parent.height
+        }
+    }
+
+    Text {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: 20
+        }
+        text: "Tap on the content to toggle full-screen mode"
+        color: "yellow"
+        font.pixelSize: 20
+        z: 2.0
+    }
+
+    Component.onCompleted: root.content = content
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneMove.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneMove.qml
new file mode 100644
index 0000000000..6095ba2c91
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneMove.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Content {
+        id: content
+        anchors.verticalCenter: parent.verticalCenter
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+
+        SequentialAnimation on x {
+            id: animation
+            loops: Animation.Infinite
+            property int from: margin
+            property int to: 100
+            property int duration: 1500
+            running: false
+            PropertyAnimation {
+                from: animation.from
+                to: animation.to
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: animation.to
+                to: animation.from
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    onWidthChanged: {
+        animation.to = root.width - content.width - margin
+        animation.start()
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneMulti.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
new file mode 100644
index 0000000000..86075628bb
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
@@ -0,0 +1,199 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+
+    property real itemWidth: (width / 3) - 40
+    property real itemTopMargin: 50
+
+    QtObject {
+        id: contentProxy
+        function initialize() {
+            video1.initialize()
+            video2.initialize()
+        }
+    }
+
+    Component {
+        id: startStopComponent
+
+        Rectangle {
+            id: root
+            color: "transparent"
+
+            function content() {
+                return root.parent
+            }
+
+            Text {
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                    bottom: parent.bottom
+                    margins: 20
+                }
+                text: content() ? content().started ? "Tap to stop" : "Tap to start" : ""
+                color: "yellow"
+                font.pixelSize: 20
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (content().started)
+                        content().stop()
+                    else
+                        content().start()
+                }
+            }
+        }
+    }
+
+    Content {
+        id: video1
+        anchors {
+            left: parent.left
+            leftMargin: 10
+            top: parent.top
+            topMargin: root.itemTopMargin
+        }
+        autoStart: false
+        contentType: "video"
+        showBorder: true
+        showFrameRate: started
+        source: parent.source1
+        width: itemWidth
+        volume: parent.volume
+
+        Loader {
+            id: video1StartStopLoader
+            onLoaded: {
+                item.parent = video1
+                item.anchors.fill = video1
+            }
+        }
+
+        onInitialized: video1StartStopLoader.sourceComponent = startStopComponent
+    }
+
+    Rectangle {
+        id: cameraHolder
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: parent.top
+            topMargin: root.itemTopMargin
+        }
+        border.width: 1
+        border.color: "white"
+        color: "transparent"
+        width: itemWidth
+        height: width
+        property bool started: false
+
+        Loader {
+            id: cameraLoader
+            onLoaded: {
+                item.parent = cameraHolder
+                item.centerIn = cameraHolder
+                item.contentType = "camera"
+                item.showFrameRate = true
+                item.width = itemWidth
+                item.z = 1.0
+                cameraErrorConnection.target = item
+                item.initialize()
+            }
+        }
+
+        Loader {
+            id: cameraStartStopLoader
+            sourceComponent: startStopComponent
+            onLoaded: {
+                item.parent = cameraHolder
+                item.anchors.fill = cameraHolder
+                item.z = 2.0
+            }
+        }
+
+        Connections {
+            id: cameraErrorConnection
+            onError: {
+                console.log("[qmlvideo] SceneMulti.camera.onError")
+                cameraHolder.stop()
+            }
+        }
+
+        function start() {
+            cameraLoader.source = "Content.qml"
+            cameraHolder.started = true
+        }
+
+        function stop() {
+            cameraLoader.source = ""
+            cameraHolder.started = false
+        }
+    }
+
+    Content {
+        id: video2
+        anchors {
+            right: parent.right
+            rightMargin: 10
+            top: parent.top
+            topMargin: root.itemTopMargin
+        }
+        autoStart: false
+        contentType: "video"
+        showBorder: true
+        showFrameRate: started
+        source: parent.source2
+        width: itemWidth
+        volume: parent.volume
+
+        Loader {
+            id: video2StartStopLoader
+            onLoaded: {
+                item.parent = video2
+                item.anchors.fill = video2
+            }
+        }
+
+        onInitialized: video2StartStopLoader.sourceComponent = startStopComponent
+    }
+
+    Component.onCompleted: root.content = contentProxy
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
new file mode 100644
index 0000000000..f0f958282f
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Rectangle {
+        id: overlay
+        y: 0.5 * parent.height
+        width: content.width
+        height: content.height
+        color: "yellow"
+        opacity: 0.5
+
+        SequentialAnimation on x {
+            id: xAnimation
+            loops: Animation.Infinite
+            property int from: margin
+            property int to: 100
+            property int duration: 1500
+            running: false
+            PropertyAnimation {
+                from: xAnimation.from
+                to: xAnimation.to
+                duration: xAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: xAnimation.to
+                to: xAnimation.from
+                duration: xAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+
+        SequentialAnimation on y {
+            id: yAnimation
+            loops: Animation.Infinite
+            property int from: margin
+            property int to: 180
+            property int duration: 1500
+            running: false
+            PropertyAnimation {
+                from: yAnimation.from
+                to: yAnimation.to
+                duration: yAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: yAnimation.to
+                to: yAnimation.from
+                duration: yAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+    }
+
+    onWidthChanged: {
+        xAnimation.to = root.width - content.width - margin
+        xAnimation.start()
+    }
+
+    onHeightChanged: {
+        //yAnimation.to = root.height - content.height - margin
+        yAnimation.start()
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneResize.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneResize.qml
new file mode 100644
index 0000000000..972f57c0e9
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneResize.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+
+        SequentialAnimation on scale {
+            id: animation
+            loops: Animation.Infinite
+            property int duration: 1500
+            running: true
+            PropertyAnimation {
+                from: 1.5
+                to: 0.5
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: 0.5
+                to: 1.5
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneRotate.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
new file mode 100644
index 0000000000..f756f5e9f7
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property int delta: 30
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Button {
+        id: rotatePositiveButton
+        anchors {
+            left: parent.left
+            bottom: rotateNegativeButton.top
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Rotate +" + delta
+        onClicked: content.rotation = content.rotation + delta
+    }
+
+    Button {
+        id: rotateNegativeButton
+        anchors {
+            left: parent.left
+            bottom: parent.bottom
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Rotate -" + delta
+        onClicked: content.rotation = content.rotation - delta
+    }
+
+    Button {
+        id: rotateValueButton
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            margins: parent.margins
+        }
+        width: 30
+        height: root.buttonHeight
+        enabled: false
+        text: content.rotation % 360
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
new file mode 100644
index 0000000000..eb3f4bb846
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    property int itemHeight: 25
+    property string sceneSource: ""
+
+    ListModel {
+        id: list
+        ListElement { name: "multi"; source: "SceneMulti.qml" }
+        ListElement { name: "video"; source: "VideoBasic.qml" }
+        ListElement { name: "video-drag"; source: "VideoDrag.qml" }
+        ListElement { name: "video-fillmode"; source: "VideoFillMode.qml" }
+        ListElement { name: "video-fullscreen"; source: "VideoFullScreen.qml" }
+        ListElement { name: "video-fullscreen-inverted"; source: "VideoFullScreenInverted.qml" }
+        ListElement { name: "video-metadata"; source: "VideoMetadata.qml" }
+        ListElement { name: "video-move"; source: "VideoMove.qml" }
+        ListElement { name: "video-overlay"; source: "VideoOverlay.qml" }
+        ListElement { name: "video-playbackrate"; source: "VideoPlaybackRate.qml" }
+        ListElement { name: "video-resize"; source: "VideoResize.qml" }
+        ListElement { name: "video-rotate"; source: "VideoRotate.qml" }
+        ListElement { name: "video-spin"; source: "VideoSpin.qml" }
+        ListElement { name: "video-seek"; source: "VideoSeek.qml" }
+        ListElement { name: "camera"; source: "CameraBasic.qml" }
+        ListElement { name: "camera-drag"; source: "CameraDrag.qml" }
+        ListElement { name: "camera-fullscreen"; source: "CameraFullScreen.qml" }
+        ListElement { name: "camera-fullscreen-inverted"; source: "CameraFullScreenInverted.qml" }
+        ListElement { name: "camera-move"; source: "CameraMove.qml" }
+        ListElement { name: "camera-overlay"; source: "CameraOverlay.qml" }
+        ListElement { name: "camera-resize"; source: "CameraResize.qml" }
+        ListElement { name: "camera-rotate"; source: "CameraRotate.qml" }
+        ListElement { name: "camera-spin"; source: "CameraSpin.qml" }
+    }
+
+    Component {
+        id: delegate
+        Item {
+            id: delegateItem
+            width: root.width
+            height: itemHeight
+
+            Button {
+                id: selectorItem
+                anchors.centerIn: parent
+                width: 0.9 * parent.width
+                height: 0.8 * itemHeight
+                text: name
+                onClicked: root.sceneSource = source
+            }
+        }
+    }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: (itemHeight * list.count) + layout.anchors.topMargin + layout.spacing
+        clip: true
+
+        Column {
+            id: layout
+
+            anchors {
+                fill: parent
+                topMargin: 10
+            }
+
+            Repeater {
+                model: list
+                delegate: delegate
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneSpin.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
new file mode 100644
index 0000000000..17a1e19e94
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+
+        PropertyAnimation on rotation {
+            id: animation
+            loops: Animation.Infinite
+            running: true
+            from: 0
+            to: 360
+            duration: 3000
+            easing.type: Easing.Linear
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SeekControl.qml b/demos/video/qmlvideo/qml/qmlvideo/SeekControl.qml
new file mode 100644
index 0000000000..74e3e4db1e
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SeekControl.qml
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Item {
+    id: seekControl
+    height: 46
+    property int duration: 0
+    property int playPosition: 0
+    property int seekPosition: 0
+    property bool enabled: true
+    property bool seeking: false
+
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        color: "black"
+        opacity: 0.3
+    }
+
+    Rectangle {
+        id: progressBar
+        anchors { left: parent.left; top: parent.top; bottom: parent.bottom }
+        width: seekControl.duration == 0 ? 0 : background.width * seekControl.playPosition / seekControl.duration
+        color: "black"
+        opacity: 0.7
+    }
+
+    Text {
+        width: 90
+        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: 10 }
+        font { family: "Nokia Sans S60"; pixelSize: 24 }
+        horizontalAlignment: Text.AlignLeft
+        verticalAlignment: Text.AlignVCenter
+        color: "white"
+        smooth: true
+        text: formatTime(playPosition)
+    }
+
+    Text {
+        width: 90
+        anchors { right: parent.right; top: parent.top; bottom: parent.bottom; rightMargin: 10 }
+        font { family: "Nokia Sans S60"; pixelSize: 24 }
+        horizontalAlignment: Text.AlignRight
+        verticalAlignment: Text.AlignVCenter
+        color: "white"
+        smooth: true
+        text: formatTime(duration)
+    }
+
+    Image {
+        id: progressHandle
+        height: 46
+        width: 10
+        source: mouseArea.pressed ? "qrc:/images/progress_handle_pressed.svg" : "qrc:/images/progress_handle.svg"
+        anchors.verticalCenter: progressBar.verticalCenter
+        x: seekControl.duration == 0 ? 0 : seekControl.playPosition / seekControl.duration * 630
+
+        MouseArea {
+            id: mouseArea
+            anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom }
+            height: 46+16
+            width: height
+            enabled: seekControl.enabled
+            drag {
+                target: progressHandle
+                axis: Drag.XAxis
+                minimumX: 0
+                maximumX: 631
+            }
+            onPressed: {
+                seekControl.seeking = true;
+            }
+            onCanceled: {
+                seekControl.seekPosition = progressHandle.x * seekControl.duration / 630
+                seekControl.seeking = false
+            }
+            onReleased: {
+                seekControl.seekPosition = progressHandle.x * seekControl.duration / 630
+                seekControl.seeking = false
+                mouse.accepted = true
+            }
+        }
+    }
+
+    Timer { // Update position also while user is dragging the progress handle
+        id: seekTimer
+        repeat: true
+        interval: 300
+        running: seekControl.seeking
+        onTriggered: {
+            seekControl.seekPosition = progressHandle.x*seekControl.duration/630
+        }
+    }
+
+    function formatTime(timeInMs) {
+        if (!timeInMs || timeInMs <= 0) return "0:00"
+        var seconds = timeInMs / 1000;
+        var minutes = Math.floor(seconds / 60)
+        seconds = Math.floor(seconds % 60)
+        if (seconds < 10) seconds = "0" + seconds;
+        return minutes + ":" + seconds
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoBasic.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
new file mode 100644
index 0000000000..42eb33bace
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneBasic {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoDrag.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
new file mode 100644
index 0000000000..c94823e7fe
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneDrag {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoDummy.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
new file mode 100644
index 0000000000..1dbb85318c
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+// Item which is loaded by VideoItem if QtMultimediaKit is not available
+Rectangle {
+    id: root
+    color: "grey"
+    height: width
+    property int duration: 0
+    property int position: 0
+    property string source
+    property real volume: 1.0
+    property real playbackRate: 1.0
+
+    signal fatalError
+    signal sizeChanged
+    signal framePainted
+
+    Text {
+        anchors.fill: parent
+        anchors.margins: 10
+        color: "white"
+        horizontalAlignment: Text.AlignHCenter
+        text: "Failed to create Video item\n\nCheck that QtMultimediaKit is installed"
+        verticalAlignment: Text.AlignVCenter
+        wrapMode: Text.Wrap
+    }
+
+    onWidthChanged: height = width
+    onHeightChanged: root.sizeChanged()
+
+    function start() { }
+    function stop() { }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
new file mode 100644
index 0000000000..f4435d65ed
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Scene {
+    id: root
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Button {
+        id: button
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            margins: parent.margins
+        }
+        width: 150
+        height: root.buttonHeight
+        text: "PreserveAspectFit"
+        onClicked: {
+            if (!content.dummy) {
+                var video = content.contentItem()
+                if (video.fillMode == Video.Stretch) {
+                    video.fillMode = Video.PreserveAspectFit
+                    text = "PreserveAspectFit"
+                } else if (video.fillMode == Video.PreserveAspectFit) {
+                    video.fillMode = Video.PreserveAspectCrop
+                    text = "PreserveAspectCrop"
+                } else {
+                    video.fillMode = Video.Stretch
+                    text = "Stretch"
+                }
+            }
+        }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
new file mode 100644
index 0000000000..14ec34ed72
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreen {
+    contentType: "video"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
new file mode 100644
index 0000000000..1b9ba575bc
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreenInverted {
+    contentType: "video"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoItem.qml
new file mode 100644
index 0000000000..b9f118ceca
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoItem.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Video {
+    id: root
+    autoLoad: false
+    height: width
+
+    signal sizeChanged
+    signal fatalError
+
+    onHeightChanged: root.sizeChanged()
+    onError: {
+        if (Video.NoError != error) {
+            console.log("[qmlvideo] VideoItem.onError error " + error + " errorString " + errorString)
+            root.fatalError()
+        }
+    }
+
+    function start() { play() }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
new file mode 100644
index 0000000000..6838f1cd5f
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onInitialized: {
+            if (!dummy)
+                metadata.createObject(root)
+        }
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Component {
+        id: metadata
+        Column {
+            anchors.fill: parent
+            Text {
+                color: "yellow"
+                text: "Title:" + content.contentItem().metaData.title
+            }
+            Text {
+                color: "yellow"
+                text: "Size:" + content.contentItem().metaData.size
+            }
+            Text {
+                color: "yellow"
+                text: "Resolution:" + content.contentItem().metaData.resolution
+            }
+            Text {
+                color: "yellow"
+                text: "Media type:" + content.contentItem().metaData.mediaType
+            }
+            Text {
+                color: "yellow"
+                text: "Video codec:" + content.contentItem().metaData.videoCodec
+            }
+            Text {
+                color: "yellow"
+                text: "Video bit rate:" + content.contentItem().metaData.videoBitRate
+            }
+            Text {
+                color: "yellow"
+                text: "Video frame rate:" +content.contentItem().metaData.videoFrameRate
+            }
+            Text {
+                color: "yellow"
+                text: "Audio codec:" + content.contentItem().metaData.audioCodec
+            }
+            Text {
+                color: "yellow"
+                text: "Audio bit rate:" + content.contentItem().metaData.audioBitRate
+            }
+            Text {
+                color: "yellow"
+                text: "Date:" + content.contentItem().metaData.date
+            }
+            Text {
+                color: "yellow"
+                text: "Description:" + content.contentItem().metaData.description
+            }
+            Text {
+                color: "yellow"
+                text: "Copyright:" + content.contentItem().metaData.copyright
+            }
+            Text {
+                color: "yellow"
+                text: "Seekable:" + content.contentItem().metaData.seekable
+            }
+        }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoMove.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoMove.qml
new file mode 100644
index 0000000000..21336c4b8e
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoMove.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneMove {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
new file mode 100644
index 0000000000..92862d1688
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneOverlay {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
new file mode 100644
index 0000000000..398887c7c1
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property real delta: 0.1
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Button {
+        id: increaseButton
+        anchors {
+            left: parent.left
+            bottom: decreaseButton.top
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Increase"
+        onClicked: {
+            var video = content.contentItem()
+            video.playbackRate = video.playbackRate + delta
+        }
+    }
+
+    Button {
+        id: decreaseButton
+        anchors {
+            left: parent.left
+            bottom: parent.bottom
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Decrease"
+        onClicked: {
+            var video = content.contentItem()
+            video.playbackRate = video.playbackRate - delta
+        }
+    }
+
+    Button {
+        id: valueButton
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            margins: parent.margins
+        }
+        width: 50
+        height: root.buttonHeight
+        enabled: false
+        text: Math.round(10 * content.contentItem().playbackRate) / 10
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoResize.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoResize.qml
new file mode 100644
index 0000000000..002cfb9876
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoResize.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneResize {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoRotate.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
new file mode 100644
index 0000000000..695896b8bb
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneRotate {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoSeek.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
new file mode 100644
index 0000000000..0173019881
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    SeekControl {
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        duration: content.contentItem().duration
+        playPosition: content.contentItem().position
+        onSeekPositionChanged: { content.contentItem().position = seekPosition }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoSpin.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
new file mode 100644
index 0000000000..0dae7d6392
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneSpin {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/main.qml b/demos/video/qmlvideo/qml/qmlvideo/main.qml
new file mode 100644
index 0000000000..d7083ee387
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/main.qml
@@ -0,0 +1,214 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    width: 640
+    height: 360
+    color: "black"
+
+    property string source1
+    property string source2
+    property color bgColor: "#002244"
+    property real volume: 0.25
+    property bool perfMonitorsLogging: false
+    property bool perfMonitorsVisible: false
+
+    QtObject {
+        id: d
+        property int fileIndex
+        property int itemHeight: 40
+        property int buttonHeight: 0.8 * itemHeight
+        property int margins: 10
+    }
+
+    // Create ScreenSaver element via Loader, so this app will still run if the
+    // SystemInfo module is not available
+    Loader {
+        source: "DisableScreenSaver.qml"
+    }
+
+    Loader {
+        id: performanceLoader
+        function init() {
+            console.log("[qmlvideo] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible)
+            var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible
+            source = enabled ? "../performancemonitor/PerformanceItem.qml" : ""
+        }
+        onLoaded: {
+            item.parent = root
+            item.anchors.fill = root
+            item.logging = root.perfMonitorsLogging
+            item.displayed = root.perfMonitorsVisible
+            item.init()
+        }
+    }
+
+    Rectangle {
+        id: inner
+        anchors.fill: parent
+        color: root.bgColor
+
+        Button {
+            id: openFile1Button
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: exitButton.left
+                margins: d.margins
+            }
+            height: d.buttonHeight
+            text: (root.source1 == "") ? "Select file 1" : root.source1
+            onClicked: showFileBrowser(1)
+        }
+
+        Button {
+            id: openFile2Button
+            anchors {
+                top: openFile1Button.bottom
+                left: parent.left
+                right: exitButton.left
+                margins: d.margins
+            }
+            height: d.buttonHeight
+            text: (root.source2 == "") ? "Select file 2" : root.source2
+            onClicked: showFileBrowser(2)
+        }
+
+        Button {
+            id: exitButton
+            anchors {
+                top: parent.top
+                right: parent.right
+                margins: d.margins
+            }
+            width: 50
+            height: d.buttonHeight
+            text: "Exit"
+            onClicked: Qt.quit()
+        }
+
+        SceneSelectionPanel {
+            id: sceneSelectionPanel
+            itemHeight: d.itemHeight
+            color: "#004444"
+            anchors {
+                top: openFile2Button.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                margins: d.margins
+            }
+            radius: 10
+            onSceneSourceChanged: {
+                console.log("[qmlvideo] main.onSceneSourceChanged source " + sceneSource)
+                sceneLoader.source = sceneSource
+                var scene = null
+                if (sceneSource == "") {
+                    if (performanceLoader.item)
+                        performanceLoader.item.videoActive = false
+                } else {
+                    scene = sceneLoader.item
+                    scene.parent = root
+                    scene.color = root.bgColor
+                    scene.buttonHeight = d.buttonHeight
+                    scene.source1 = source1
+                    scene.source2 = source2
+                    scene.volume = volume
+                    scene.anchors.fill = root
+                    scene.close.connect(closeScene)
+                    scene.content.initialize()
+                }
+                videoFramePaintedConnection.target = scene
+                inner.visible = (sceneSource == "")
+            }
+        }
+    }
+
+    Loader {
+        id: sceneLoader
+    }
+
+    Connections {
+        id: videoFramePaintedConnection
+        onVideoFramePainted: {
+            if (performanceLoader.item)
+                performanceLoader.item.videoFramePainted()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    Loader {
+        id: fileBrowserLoader
+    }
+
+    // Called from main() once root properties have been set
+    function init() {
+        performanceLoader.init()
+    }
+
+    function qmlFramePainted() {
+        if (performanceLoader.item)
+            performanceLoader.item.qmlFramePainted()
+    }
+
+    function showFileBrowser(index) {
+        console.log("[qmlvideo] main.showFileBrowser")
+        d.fileIndex = index
+        fileBrowserLoader.source = "FileBrowser.qml"
+        fileBrowserLoader.item.parent = root
+        fileBrowserLoader.item.anchors.fill = root
+        fileBrowserLoader.item.openFile.connect(root.openFile)
+        inner.visible = false
+    }
+
+    function openFile(path) {
+        console.log("[qmlvideo] main.openFile " + d.fileIndex + " \"" + path + "\"")
+        fileBrowserLoader.source = ""
+        if (1 == d.fileIndex)
+            root.source1 = path
+        else if (2 == d.fileIndex)
+            root.source2 = path
+        inner.visible = true
+    }
+
+    function closeScene() {
+        console.log("[qmlvideo] main.closeScene")
+        sceneSelectionPanel.sceneSource = ""
+    }
+}
diff --git a/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
new file mode 100644
index 0000000000..8ba6e8864d
--- /dev/null
+++ b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -0,0 +1,200 @@
+// checksum 0x78c version 0x60010
+/*
+  This file was generated by the Qt Quick Application wizard of Qt Creator.
+  QmlApplicationViewer is a convenience class containing mobile device specific
+  code such as screen orientation handling. Also QML paths and debugging are
+  handled here.
+  It is recommended not to modify this file, since newer versions of Qt Creator
+  may offer an updated version of it.
+*/
+
+#include "qmlapplicationviewer.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtGui/QApplication>
+
+#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
+
+#ifdef HARMATTAN_BOOSTER
+#include <MDeclarativeCache>
+#endif
+
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+
+#include <qt_private/qdeclarativedebughelper_p.h>
+
+#if !defined(NO_JSDEBUGGER)
+#include <jsdebuggeragent.h>
+#endif
+#if !defined(NO_QMLOBSERVER)
+#include <qdeclarativeviewobserver.h>
+#endif
+
+// Enable debugging before any QDeclarativeEngine is created
+struct QmlJsDebuggingEnabler
+{
+    QmlJsDebuggingEnabler()
+    {
+        QDeclarativeDebugHelper::enableDebugging();
+    }
+};
+
+// Execute code in constructor before first QDeclarativeEngine is instantiated
+static QmlJsDebuggingEnabler enableDebuggingHelper;
+
+#endif // QMLJSDEBUGGER
+
+class QmlApplicationViewerPrivate
+{
+    QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
+
+    QString mainQmlFile;
+    QDeclarativeView *view;
+    friend class QmlApplicationViewer;
+    QString adjustPath(const QString &path);
+};
+
+QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
+{
+#ifdef Q_OS_UNIX
+#ifdef Q_OS_MAC
+    if (!QDir::isAbsolutePath(path))
+        return QCoreApplication::applicationDirPath()
+                + QLatin1String("/../Resources/") + path;
+#else
+    QString pathInInstallDir;
+    const QString applicationDirPath = QCoreApplication::applicationDirPath();
+    pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
+
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
+#endif
+#endif
+    return path;
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(this))
+{
+    connect(engine(), SIGNAL(quit()), SLOT(close()));
+    setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView *view, QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(view))
+{
+    connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
+    view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::~QmlApplicationViewer()
+{
+    delete d;
+}
+
+QmlApplicationViewer *QmlApplicationViewer::create()
+{
+#ifdef HARMATTAN_BOOSTER
+    return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
+#else
+    return new QmlApplicationViewer();
+#endif
+}
+
+void QmlApplicationViewer::setMainQmlFile(const QString &file)
+{
+    d->mainQmlFile = d->adjustPath(file);
+    d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));
+}
+
+void QmlApplicationViewer::addImportPath(const QString &path)
+{
+    d->view->engine()->addImportPath(d->adjustPath(path));
+}
+
+void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
+{
+#if defined(Q_OS_SYMBIAN)
+    // If the version of Qt on the device is < 4.7.2, that attribute won't work
+    if (orientation != ScreenOrientationAuto) {
+        const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
+        if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
+            qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
+            return;
+        }
+    }
+#endif // Q_OS_SYMBIAN
+
+    Qt::WidgetAttribute attribute;
+    switch (orientation) {
+#if QT_VERSION < 0x040702
+    // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
+    case ScreenOrientationLockPortrait:
+        attribute = static_cast<Qt::WidgetAttribute>(128);
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = static_cast<Qt::WidgetAttribute>(129);
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = static_cast<Qt::WidgetAttribute>(130);
+        break;
+#else // QT_VERSION < 0x040702
+    case ScreenOrientationLockPortrait:
+        attribute = Qt::WA_LockPortraitOrientation;
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = Qt::WA_LockLandscapeOrientation;
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = Qt::WA_AutoOrientation;
+        break;
+#endif // QT_VERSION < 0x040702
+    };
+    setAttribute(attribute, true);
+}
+
+void QmlApplicationViewer::showExpanded()
+{
+#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
+    d->view->showFullScreen();
+#elif defined(Q_WS_MAEMO_5)
+    d->view->showMaximized();
+#else
+    d->view->show();
+#endif
+}
+
+QApplication *createApplication(int &argc, char **argv)
+{
+#ifdef HARMATTAN_BOOSTER
+    return MDeclarativeCache::qApplication(argc, argv);
+#else
+    return new QApplication(argc, argv);
+#endif
+}
diff --git a/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
new file mode 100644
index 0000000000..f8008f5c4a
--- /dev/null
+++ b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
@@ -0,0 +1,47 @@
+// checksum 0x82ed version 0x60010
+/*
+  This file was generated by the Qt Quick Application wizard of Qt Creator.
+  QmlApplicationViewer is a convenience class containing mobile device specific
+  code such as screen orientation handling. Also QML paths and debugging are
+  handled here.
+  It is recommended not to modify this file, since newer versions of Qt Creator
+  may offer an updated version of it.
+*/
+
+#ifndef QMLAPPLICATIONVIEWER_H
+#define QMLAPPLICATIONVIEWER_H
+
+#include <QtDeclarative/QDeclarativeView>
+
+class QmlApplicationViewer : public QDeclarativeView
+{
+    Q_OBJECT
+
+public:
+    enum ScreenOrientation {
+        ScreenOrientationLockPortrait,
+        ScreenOrientationLockLandscape,
+        ScreenOrientationAuto
+    };
+
+    explicit QmlApplicationViewer(QWidget *parent = 0);
+    virtual ~QmlApplicationViewer();
+
+    static QmlApplicationViewer *create();
+
+    void setMainQmlFile(const QString &file);
+    void addImportPath(const QString &path);
+
+    // Note that this will only have an effect on Symbian and Fremantle.
+    void setOrientation(ScreenOrientation orientation);
+
+    void showExpanded();
+
+private:
+    explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
+    class QmlApplicationViewerPrivate *d;
+};
+
+QApplication *createApplication(int &argc, char **argv);
+
+#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
new file mode 100644
index 0000000000..24aa9b466a
--- /dev/null
+++ b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -0,0 +1,141 @@
+# Based on file auto-generated by Qt Creator (version 0x60010)
+# Modified to install into the correct destination folder
+
+include(../../../../features/basic_examples_setup.pri)
+target.path = $${QT_MOBILITY_DEMOS}/$${TARGET}
+INSTALLS += target
+
+QT += declarative
+
+SOURCES += $$PWD/qmlapplicationviewer.cpp
+HEADERS += $$PWD/qmlapplicationviewer.h
+INCLUDEPATH += $$PWD
+
+# Include JS debugger library if QMLJSDEBUGGER_PATH is set
+!isEmpty(QMLJSDEBUGGER_PATH) {
+    include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
+} else {
+    DEFINES -= QMLJSDEBUGGER
+}
+
+contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
+    DEFINES += HARMATTAN_BOOSTER
+}
+
+# The code below handles deployment to Symbian and Maemo, aswell as copying
+# of the application data to shadow build directories on desktop.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+    item = item$${deploymentfolder}
+    itemsources = $${item}.sources
+    $$itemsources = $$eval($${deploymentfolder}.source)
+    itempath = $${item}.path
+    $$itempath= $$eval($${deploymentfolder}.target)
+    export($$itemsources)
+    export($$itempath)
+    DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$PWD
+
+symbian {
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+} else:win32 {
+    copyCommand =
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+        source = $$replace(source, /, \\)
+        sourcePathSegments = $$split(source, \\)
+        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
+        target = $$replace(target, /, \\)
+        !isEqual(source,$$target) {
+            !isEmpty(copyCommand):copyCommand += &&
+            isEqual(QMAKE_DIR_SEP, \\) {
+                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            } else {
+                source = $$replace(source, \\\\, /)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                target = $$replace(target, \\\\, /)
+                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+            }
+        }
+    }
+    !isEmpty(copyCommand) {
+        copyCommand = @echo Copying application data... && $$copyCommand
+        copydeploymentfolders.commands = $$copyCommand
+        first.depends = $(first) copydeploymentfolders
+        export(first.depends)
+        export(copydeploymentfolders.commands)
+        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+    }
+} else:unix {
+    maemo5 {
+        desktopfile.files = $${TARGET}.desktop
+        desktopfile.path = /usr/share/applications/hildon
+        icon.files = $${TARGET}64.png
+        icon.path = /usr/share/icons/hicolor/64x64/apps
+    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        desktopfile.files = $${TARGET}_harmattan.desktop
+        desktopfile.path = /usr/share/applications
+        icon.files = $${TARGET}80.png
+        icon.path = /usr/share/icons/hicolor/80x80/apps
+    } else { # Assumed to be a Desktop Unix
+        copyCommand =
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+            source = $$replace(source, \\\\, /)
+            macx {
+                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+            } else {
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+            }
+            target = $$replace(target, \\\\, /)
+            sourcePathSegments = $$split(source, /)
+            targetFullPath = $$target/$$last(sourcePathSegments)
+            !isEqual(source,$$targetFullPath) {
+                !isEmpty(copyCommand):copyCommand += &&
+                copyCommand += $(MKDIR) \"$$target\"
+                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
+            }
+        }
+        !isEmpty(copyCommand) {
+            copyCommand = @echo Copying application data... && $$copyCommand
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            export(first.depends)
+            export(copydeploymentfolders.commands)
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
+    installPrefix = $${QT_MOBILITY_DEMOS}/$${TARGET}
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+
+    !isEmpty(desktopfile.path) {
+        export(icon.files)
+        export(icon.path)
+        export(desktopfile.files)
+        export(desktopfile.path)
+        INSTALLS += icon desktopfile
+    }
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
+
diff --git a/demos/video/qmlvideo/qmlvideo.png b/demos/video/qmlvideo/qmlvideo.png
new file mode 100644
index 0000000000..707d5c4e85
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.png
diff --git a/demos/video/qmlvideo/qmlvideo.pro b/demos/video/qmlvideo/qmlvideo.pro
new file mode 100644
index 0000000000..e7d49483f3
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.pro
@@ -0,0 +1,35 @@
+TEMPLATE = app
+TARGET = qmlvideo
+
+SOURCES += main.cpp
+HEADERS += trace.h
+RESOURCES += qmlvideo.qrc
+
+qml_folder.source = qml/qmlvideo
+qml_folder.target = qml
+DEPLOYMENTFOLDERS = qml_folder
+
+images_folder.source = images
+images_folder.target = .
+DEPLOYMENTFOLDERS += images_folder
+
+SNIPPETS_PATH = ../snippets
+include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
+performanceItemAddDeployment()
+
+symbian {
+    TARGET.CAPABILITY += NetworkServices UserEnvironment
+}
+
+include(qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
diff --git a/demos/video/qmlvideo/qmlvideo.qrc b/demos/video/qmlvideo/qmlvideo.qrc
new file mode 100644
index 0000000000..4896b336f8
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.qrc
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/images">
+        <file alias="leaves.jpg">images/leaves.jpg</file>
+        <file alias="close.png">images/close.png</file>
+        <file alias="folder.png">images/folder.png</file>
+        <file alias="titlebar.png">images/titlebar.png</file>
+        <file alias="titlebar.sci">images/titlebar.sci</file>
+        <file alias="up.png">images/up.png</file>
+        <file alias="progress_handle.svg">images/progress_handle.svg</file>
+        <file alias="progress_handle_pressed.svg">images/progress_handle_pressed.svg</file>
+    </qresource>
+</RCC>
diff --git a/demos/video/qmlvideo/qmlvideo.svg b/demos/video/qmlvideo/qmlvideo.svg
new file mode 100644
index 0000000000..566acfada0
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="44px"
+   version="1.1"
+   viewBox="0 0 44 44"
+   width="44px"
+   x="0px"
+   y="0px"
+   id="svg2"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="qt.svg">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 22 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="44 : 22 : 1"
+       inkscape:persp3d-origin="22 : 14.666667 : 1"
+       id="perspective2836" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="21.454545"
+     inkscape:cx="49.412871"
+     inkscape:cy="21.894358"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3" />
+  <g
+     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
+     id="g3">
+    <path
+       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
+       style="fill:#006225"
+       id="path5"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
+       style="fill:#80c342"
+       id="path7" />
+    <path
+       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
+       style="fill:#006225"
+       id="path11" />
+    <path
+       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
+       style="fill:#006225"
+       id="path13" />
+    <path
+       id="path17"
+       style="fill:#ffffff"
+       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
+    <path
+       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
+       style="fill:#006225"
+       id="path19" />
+    <path
+       id="path21"
+       style="fill:#006225"
+       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
+  </g>
+</svg>
diff --git a/demos/video/qmlvideo/qmlvideo_harmattan.desktop b/demos/video/qmlvideo/qmlvideo_harmattan.desktop
new file mode 100644
index 0000000000..b2c45dd31f
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo_harmattan.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=qmlvideo
+Exec=/opt/qmlvideo/bin/qmlvideo
+Icon=
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/README b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/README
new file mode 100644
index 0000000000..28b7e589ac
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/README
@@ -0,0 +1,6 @@
+The Debian Package qmlvideo
+----------------------------
+
+Comments regarding the Package
+
+ -- unknown <>  Thu, 20 Oct 2011 09:42:19 +0100
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/changelog b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/changelog
new file mode 100644
index 0000000000..c6240129ee
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/changelog
@@ -0,0 +1,5 @@
+qmlvideo (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- unknown <>  Thu, 20 Oct 2011 09:42:19 +0100
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/compat b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/compat
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/compat
@@ -0,0 +1 @@
+7
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/control b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/control
new file mode 100644
index 0000000000..5fa88691a2
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/control
@@ -0,0 +1,14 @@
+Source: qmlvideo
+Section: user/other
+Priority: optional
+Maintainer: unknown <>
+Build-Depends: debhelper (>= 5), libqt4-dev
+Standards-Version: 3.7.3
+Homepage: <insert the upstream URL, if relevant>
+
+Package: qmlvideo
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+XSBC-Maemo-Display-Name: qmlvideo
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/copyright b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/copyright
new file mode 100644
index 0000000000..99706fa0d4
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/copyright
@@ -0,0 +1,40 @@
+This package was debianized by unknown <> on
+Thu, 20 Oct 2011 09:42:19 +0100.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2011, unknown <> and
+is licensed under the GPL, see above.
+
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/manifest.aegis b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/manifest.aegis
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/manifest.aegis
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/rules b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/rules
new file mode 100644
index 0000000000..f7ea2a21a0
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+
+configure-stamp:
+	dh_testdir
+	# qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp
+	dh_testdir
+
+	# Add here commands to compile the package.
+	# $(MAKE) # Uncomment this line for use without Qt Creator
+	#docbook-to-man debian/qmlvideo.sgml > qmlvideo.1
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/qmlvideo.
+	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/qmlvideo install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	# dh_shlibdeps # Uncomment this line for use without Qt Creator
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
diff --git a/demos/video/qmlvideo/trace.h b/demos/video/qmlvideo/trace.h
new file mode 100644
index 0000000000..854a2413f7
--- /dev/null
+++ b/demos/video/qmlvideo/trace.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TRACE_H
+#define TRACE_H
+
+#include <QtCore/QDebug>
+
+#define ENABLE_TRACE
+//#define VERBOSE_TRACE
+
+namespace Trace {
+
+class NullDebug
+{
+public:
+    template <typename T>
+    NullDebug& operator<<(const T&) { return *this; }
+};
+
+inline NullDebug nullDebug() { return NullDebug(); }
+
+template <typename T>
+struct PtrWrapper
+{
+    PtrWrapper(const T *ptr) : m_ptr(ptr) { }
+    const T *const m_ptr;
+};
+
+} // namespace Trace
+
+template <typename T>
+inline QDebug& operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
+{
+    debug.nospace() << "[" << (void*)wrapper.m_ptr << "]";
+    return debug.space();
+}
+
+template<typename T>
+inline const void *qtVoidPtr(const T *ptr)
+{ return static_cast<const void *>(ptr); }
+
+#define qtThisPtr() qtVoidPtr(this)
+
+#ifdef ENABLE_TRACE
+        inline QDebug qtTrace() { return qDebug() << "[qmlvideo]"; }
+#    ifdef VERBOSE_TRACE
+        inline QDebug qtVerboseTrace() { return qtTrace(); }
+#    else
+        inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#    endif
+#else
+    inline Trace::NullDebug qtTrace() { return Trace::nullDebug(); }
+    inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#endif
+
+#endif // TRACE_H
diff --git a/demos/video/qmlvideofx/images/close.png b/demos/video/qmlvideofx/images/close.png
new file mode 100644
index 0000000000..6904df0e44
--- /dev/null
+++ b/demos/video/qmlvideofx/images/close.png
diff --git a/demos/video/qmlvideofx/images/folder.png b/demos/video/qmlvideofx/images/folder.png
new file mode 100644
index 0000000000..e53e2ad464
--- /dev/null
+++ b/demos/video/qmlvideofx/images/folder.png
diff --git a/demos/video/qmlvideofx/images/qt-logo.png b/demos/video/qmlvideofx/images/qt-logo.png
new file mode 100644
index 0000000000..7d3e97eb36
--- /dev/null
+++ b/demos/video/qmlvideofx/images/qt-logo.png
diff --git a/demos/video/qmlvideofx/images/titlebar.png b/demos/video/qmlvideofx/images/titlebar.png
new file mode 100644
index 0000000000..51c90082d0
--- /dev/null
+++ b/demos/video/qmlvideofx/images/titlebar.png
diff --git a/demos/video/qmlvideofx/images/titlebar.sci b/demos/video/qmlvideofx/images/titlebar.sci
new file mode 100644
index 0000000000..0418d94cd6
--- /dev/null
+++ b/demos/video/qmlvideofx/images/titlebar.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png
diff --git a/demos/video/qmlvideofx/images/up.png b/demos/video/qmlvideofx/images/up.png
new file mode 100644
index 0000000000..b05f8025d0
--- /dev/null
+++ b/demos/video/qmlvideofx/images/up.png
diff --git a/demos/video/qmlvideofx/main.cpp b/demos/video/qmlvideofx/main.cpp
new file mode 100644
index 0000000000..c813177123
--- /dev/null
+++ b/demos/video/qmlvideofx/main.cpp
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtGui/QGraphicsObject>
+#include "qmlapplicationviewer.h"
+#include "trace.h"
+
+#ifdef SMALL_SCREEN_LAYOUT
+    static const QLatin1String MainQmlFile("main-smallscreen.qml");
+#else
+    static const QLatin1String MainQmlFile("main-largescreen.qml");
+#endif
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+#include "painteventmonitor.h"
+#include "performancemonitordeclarative.h"
+#endif
+
+#ifndef USE_OPENGL_GRAPHICS_SYSTEM
+#include <QtOpenGL/QGLWidget>
+#include <QtOpenGL/qgl.h>
+#endif
+
+int main(int argc, char *argv[])
+{
+#ifdef USE_OPENGL_GRAPHICSSYSTEM
+    QApplication::setGraphicsSystem("opengl");
+#endif
+
+    QApplication app(argc, argv);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    PerformanceMonitor::qmlRegisterTypes();
+#endif
+
+    QUrl fileName;
+    qreal volume = 0.5;
+    QStringList args = app.arguments();
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    PerformanceMonitor::State performanceMonitorState;
+#endif
+    for (int i=1; i<args.count(); ++i) {
+        const QString &arg = args.at(i);
+        if (arg.startsWith('-')) {
+            if ("-volume" == arg) {
+                if (i+1 < args.count())
+                    volume = 0.01 * args.at(++i).toInt();
+                else
+                    qtTrace() << "Option \"-volume\" takes a value";
+            }
+#ifdef PERFORMANCEMONITOR_SUPPORT
+            else if (PerformanceMonitor::parseArgument(arg, performanceMonitorState)) {
+                // Do nothing
+            }
+#endif
+            else {
+                qtTrace() << "Option" << arg << "ignored";
+            }
+        } else {
+            if (fileName.isEmpty())
+                fileName = QUrl::fromLocalFile(arg);
+            else
+                qtTrace() << "Argument" << arg << "ignored";
+        }
+    }
+
+    QmlApplicationViewer viewer;
+
+#ifndef USE_OPENGL_GRAPHICS_SYSTEM
+    QGLFormat format = QGLFormat::defaultFormat();
+    format.setSampleBuffers(false);
+    format.setSwapInterval(1);
+    QGLWidget* glWidget = new QGLWidget(format);
+    glWidget->setAutoFillBackground(false);
+    viewer.setViewport(glWidget);
+#endif
+
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+    viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile);
+    viewer.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    QGraphicsObject *rootObject = viewer.rootObject();
+    rootObject->setProperty("fileName", fileName);
+    viewer.rootObject()->setProperty("volume", volume);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    if (performanceMonitorState.valid) {
+        rootObject->setProperty("perfMonitorsLogging", performanceMonitorState.logging);
+        rootObject->setProperty("perfMonitorsVisible", performanceMonitorState.visible);
+    }
+    PaintEventMonitor paintEventMonitor;
+    paintEventMonitor.setTarget(viewer.viewport());
+    QObject::connect(&paintEventMonitor, SIGNAL(targetPainted()),
+                     rootObject, SLOT(qmlFramePainted()));
+#endif
+
+#ifdef SMALL_SCREEN_PHYSICAL
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
+    viewer.showFullScreen();
+#else
+    viewer.showExpanded();
+#endif
+
+    // Delay invokation of init until the event loop has started, to work around
+    // a GL context issue on Harmattan: without this, we get the following error
+    // when the first ShaderEffectItem is created:
+    // "QGLShaderProgram::addShader: Program and shader are not associated with same context"
+    QMetaObject::invokeMethod(viewer.rootObject(), "init", Qt::QueuedConnection);
+
+    return app.exec();
+}
+
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Button.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Button.qml
new file mode 100644
index 0000000000..dfff92e503
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Button.qml
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: textColor
+    radius: 0.25 * height
+
+    property string text
+    property color bgColor: "white"
+    property color bgColorSelected: "red"
+    property color textColor: "black"
+    property alias enabled: mouseArea.enabled
+
+    signal clicked
+
+    Rectangle {
+        anchors { fill: parent; margins: 1 }
+        color: mouseArea.pressed ? bgColorSelected : bgColor
+        radius: 0.25 * height
+
+        Text {
+            id: text
+            anchors.centerIn: parent
+            text: root.text
+            font.pixelSize: 0.5 * parent.height
+            color: mouseArea.pressed ? bgColor : textColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        MouseArea {
+            id: mouseArea
+            anchors.fill: parent
+            onClicked: {
+                root.clicked()
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Content.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Content.qml
new file mode 100644
index 0000000000..6cca086e77
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Content.qml
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    id: root
+    color: "black"
+    property alias effect: effectLoader.item
+    property alias gripSize: divider.gripSize
+    property string effectSource
+    property real volume: 0.5
+
+    signal videoFramePainted
+
+    Divider {
+        id: divider
+        visible: false
+        z: 1.0
+        onValueChanged: updateDivider()
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        smooth: true
+        hideSource: true
+    }
+
+    Loader {
+        id: contentLoader
+    }
+
+    Loader {
+        id: effectLoader
+        source: effectSource
+    }
+
+    Connections {
+        id: videoFramePaintedConnection
+        onFramePainted: {
+            if (performanceLoader.item)
+               root.videoFramePainted()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    onEffectSourceChanged: {
+        console.log("[qmlvideofx] Content.onEffectSourceChanged " + effectSource)
+        effectLoader.source = effectSource
+        effectLoader.item.parent = root
+        effectLoader.item.targetWidth = root.width
+        effectLoader.item.targetHeight = root.height
+        updateSource()
+        effectLoader.item.source = theSource
+        divider.visible = effectLoader.item.supportsDivider
+        updateDivider()
+    }
+
+    function init() {
+        console.log("[qmlvideofx] Content.init")
+        openImage("qrc:/images/qt-logo.png")
+        root.effectSource = "EffectPassThrough.qml"
+    }
+
+    function updateDivider() {
+        if (effectLoader.item && effectLoader.item.supportsDivider)
+            effectLoader.item.dividerValue = divider.value
+    }
+
+    function updateSource() {
+        console.log("[qmlvideofx] Content.updateSource")
+        if (contentLoader.item) {
+            contentLoader.item.parent = root
+            contentLoader.item.anchors.fill = root
+            theSource.sourceItem = contentLoader.item
+            if (effectLoader.item)
+                effectLoader.item.anchors.fill = contentLoader.item
+        }
+    }
+
+    function openImage(path) {
+        console.log("[qmlvideofx] Content.openImage \"" + path + "\"")
+        stop()
+        contentLoader.source = "ContentImage.qml"
+        videoFramePaintedConnection.target = null
+        contentLoader.item.source = path
+        updateSource()
+    }
+
+    function openVideo(path) {
+        console.log("[qmlvideofx] Content.openVideo \"" + path + "\"")
+        stop()
+        contentLoader.source = "ContentVideo.qml"
+        videoFramePaintedConnection.target = contentLoader.item
+        contentLoader.item.source = path
+        contentLoader.item.volume = volume
+        contentLoader.item.play()
+        updateSource()
+    }
+
+    function openCamera() {
+        console.log("[qmlvideofx] Content.openCamera")
+        stop()
+        contentLoader.source = "ContentCamera.qml"
+        videoFramePaintedConnection.target = contentLoader.item
+        updateSource()
+    }
+
+    function stop() {
+        console.log("[qmlvideofx] Content.stop")
+        if (contentLoader.source == "ContentVideo.qml")
+            contentLoader.item.stop()
+        theSource.sourceItem = null
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
new file mode 100644
index 0000000000..aaeb7ab347
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Camera {
+
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
new file mode 100644
index 0000000000..c6f5740e78
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Image {
+    smooth: true
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
new file mode 100644
index 0000000000..ecb96d7b1d
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Video {
+    volume: 0.5
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml b/demos/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
new file mode 100644
index 0000000000..181baf2363
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMobility.systeminfo 1.1
+
+Item {
+    ScreenSaver {
+        screenSaverInhibited: true
+    }
+}
+
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Divider.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Divider.qml
new file mode 100644
index 0000000000..95830e11ef
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Divider.qml
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    anchors.fill: parent
+    color: "transparent"
+    property alias value: grip.value
+    property alias lineWidth: line.width
+    property alias gripSize: grip.width
+
+    Rectangle {
+        id: grip
+        property real value: 0.5
+        x: (value * parent.width) - width/2
+        anchors.top: parent.top
+        width: 20
+        height: width
+        radius: width/2
+        color: "red"
+
+        MouseArea {
+            anchors.fill:  parent
+
+            drag {
+                target: grip
+                axis: Drag.XAxis
+                minimumX: -parent.width/2
+                maximumX: root.width - parent.width/2
+            }
+
+            onPositionChanged:  {
+                if (drag.active)
+                    updatePosition()
+            }
+
+            onReleased: {
+                updatePosition()
+            }
+
+            function updatePosition() {
+                value = (grip.x + grip.width/2) / grip.parent.width
+            }
+        }
+    }
+
+    Rectangle {
+        id: line
+        anchors { top: parent.top; bottom: parent.bottom }
+        x: value * parent.width - (width / 2)
+        width: 2
+        color: "red"
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Effect.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Effect.qml
new file mode 100644
index 0000000000..6e85a32694
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Effect.qml
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+ShaderEffectItem {
+    property variant source
+    property int numParameters: 0
+    property bool supportsDivider: false
+    property real targetWidth: 0
+    property real targetHeight: 0
+
+    property string fragmentShaderCommon: "
+    #ifdef GL_ES
+        precision mediump float;
+    #else
+    #   define lowp
+    #   define mediump
+    #   define highp
+    #endif // GL_ES
+    "
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
new file mode 100644
index 0000000000..a3ae33ced5
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+    property real grid: 10.0 * param1Value
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float grid;
+        uniform float dividerValue;
+        const float step_x = 0.0015625;
+        const float step_y = 0.0027778;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            float offx = floor(uv.x  / (grid * step_x));
+            float offy = floor(uv.y  / (grid * step_y));
+            vec3 res = texture2D(source, vec2(offx * grid * step_x , offy * grid * step_y)).rgb;
+            vec2 prc = fract(uv / vec2(grid * step_x, grid * step_y));
+            vec2 pw = pow(abs(prc - 0.5), vec2(2.0));
+            float  rs = pow(0.45, 2.0);
+            float gr = smoothstep(rs - 0.1, rs + 0.1, pw.x + pw.y);
+            float y = (res.r + res.g + res.b) / 3.0;
+            vec3 ra = res / y;
+            float ls = 0.3;
+            float lb = ceil(y / ls);
+            float lf = ls * lb + 0.3;
+            res = lf * res;
+            vec3 col = mix(res, vec3(0.1, 0.1, 0.1), gr);
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(col, 1.0);
+            else
+                gl_FragColor = qt_Opacity * texture2D(source, uv);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
new file mode 100644
index 0000000000..9b9a24875e
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float param1Value;
+        uniform float dividerValue;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec4 orig = texture2D(source, uv);
+            vec3 col = orig.rgb;
+            float y = 0.3 *col.r + 0.59 * col.g + 0.11 * col.b;
+            y = y < param1Value ? 0.0 : 1.0;
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(y, y, y, 1.0);
+            else
+                gl_FragColor = qt_Opacity * orig;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
new file mode 100644
index 0000000000..3956bd9848
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 0
+    property bool supportsDivider: true
+
+    property real dividerValue: 0.5
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        const float step_w = 0.0015625;
+        const float step_h = 0.0027778;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
+            vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
+            vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
+            vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
+            vec3 t5 = texture2D(source, uv).rgb;
+            vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
+            vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
+            vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
+            vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
+            vec3 rr = -4.0 * t1 - 4.0 * t2 - 4.0 * t4 + 12.0 * t5;
+            float y = (rr.r + rr.g + rr.b) / 3.0;
+            vec3 col = vec3(y, y, y) + 0.3;
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(col, 1.0);
+            else
+                gl_FragColor = qt_Opacity * texture2D(source, uv);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
new file mode 100644
index 0000000000..c3d2b3e35f
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20100909/shader-library-gaussian-blur-post-processing-filter-in-glsl/
+
+import QtQuick 1.0
+
+Item {
+    property alias targetWidth: verticalShader.targetWidth
+    property alias targetHeight: verticalShader.targetHeight
+    property alias source: verticalShader.source
+
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    Effect {
+        id: verticalShader
+        anchors.fill:  parent
+        property real dividerValue: parent.dividerValue
+        property real blurSize: 4.0 * parent.param1Value / targetWidth
+
+        fragmentShader: fragmentShaderCommon + "
+            uniform float dividerValue;
+            uniform float blurSize;
+
+            uniform sampler2D source;
+            uniform lowp float qt_Opacity;
+            varying vec2 qt_TexCoord0;
+
+            void main()
+            {
+                vec2 uv = qt_TexCoord0.xy;
+                vec4 c = vec4(0.0);
+                if (uv.x < dividerValue) {
+                    c += texture2D(source, uv - vec2(0.0, 4.0*blurSize)) * 0.05;
+                    c += texture2D(source, uv - vec2(0.0, 3.0*blurSize)) * 0.09;
+                    c += texture2D(source, uv - vec2(0.0, 2.0*blurSize)) * 0.12;
+                    c += texture2D(source, uv - vec2(0.0, 1.0*blurSize)) * 0.15;
+                    c += texture2D(source, uv) * 0.16;
+                    c += texture2D(source, uv + vec2(0.0, 1.0*blurSize)) * 0.15;
+                    c += texture2D(source, uv + vec2(0.0, 2.0*blurSize)) * 0.12;
+                    c += texture2D(source, uv + vec2(0.0, 3.0*blurSize)) * 0.09;
+                    c += texture2D(source, uv + vec2(0.0, 4.0*blurSize)) * 0.05;
+                } else {
+                    c = texture2D(source, qt_TexCoord0);
+                }
+                gl_FragColor = qt_Opacity * c;
+            }"
+
+        Effect {
+            id: horizontalShader
+            anchors.fill:  parent
+            property real dividerValue: parent.dividerValue
+            property real blurSize: parent.blurSize
+
+            fragmentShader: fragmentShaderCommon + "
+                uniform float dividerValue;
+                uniform float blurSize;
+
+                uniform sampler2D source;
+                uniform lowp float qt_Opacity;
+                varying vec2 qt_TexCoord0;
+
+                void main()
+                {
+                    vec2 uv = qt_TexCoord0.xy;
+                    vec4 c = vec4(0.0);
+                    if (uv.x < dividerValue) {
+                        c += texture2D(source, uv - vec2(4.0*blurSize, 0.0)) * 0.05;
+                        c += texture2D(source, uv - vec2(3.0*blurSize, 0.0)) * 0.09;
+                        c += texture2D(source, uv - vec2(2.0*blurSize, 0.0)) * 0.12;
+                        c += texture2D(source, uv - vec2(1.0*blurSize, 0.0)) * 0.15;
+                        c += texture2D(source, uv) * 0.16;
+                        c += texture2D(source, uv + vec2(1.0*blurSize, 0.0)) * 0.15;
+                        c += texture2D(source, uv + vec2(2.0*blurSize, 0.0)) * 0.12;
+                        c += texture2D(source, uv + vec2(3.0*blurSize, 0.0)) * 0.09;
+                        c += texture2D(source, uv + vec2(4.0*blurSize, 0.0)) * 0.05;
+                    } else {
+                        c = texture2D(source, qt_TexCoord0);
+                    }
+                    gl_FragColor = qt_Opacity * c;
+                }"
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
new file mode 100644
index 0000000000..5f0b0d4416
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 0
+    property bool supportsDivider: true
+
+    property real dividerValue: 0.5
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        const float step_w = 0.0015625;
+        const float step_h = 0.0027778;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
+            vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
+            vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
+            vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
+            vec3 t5 = texture2D(source, uv).rgb;
+            vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
+            vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
+            vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
+            vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
+            vec3 xx = t1 + 2.0*t2 + t3 - t7 - 2.0*t8 - t9;
+            vec3 yy = t1 - t3 + 2.0*t4 - 2.0*t6 + t7 - t9;
+            vec3 rr = sqrt(xx * xx + yy * yy);
+            vec3 col = rr * 2.0 * t5;
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(col, 1.0);
+            else
+                gl_FragColor = qt_Opacity * texture2D(source, uv);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
new file mode 100644
index 0000000000..afe94c917c
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 2
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real param2Value: 0.5
+    property real dividerValue: 0.5
+
+    property real targetHue: 360.0 * param1Value
+    property real windowWidth: 60.0 * param2Value
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float targetHue;
+        uniform float windowWidth;
+        uniform float dividerValue;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void rgb2hsl(vec3 rgb, out float h, out float s, float l)
+        {
+            float maxval = max(rgb.r, max(rgb.g, rgb.b));
+            float minval = min(rgb.r, min(rgb.g, rgb.b));
+            float delta = maxval - minval;
+            l = (minval + maxval) / 2.0;
+            s = 0.0;
+            if (l > 0.0 && l < 1.0)
+                s = delta / (l < 0.5 ? 2.0 * l : 2.0 - 2.0 * l);
+            h = 0.0;
+            if (delta > 0.0)
+            {
+                if (rgb.r == maxval && rgb.g != maxval)
+                    h += (rgb.g - rgb.b ) / delta;
+                if (rgb.g == maxval && rgb.b != maxval)
+                    h += 2.0  + (rgb.b - rgb.r) / delta;
+                if (rgb.b == maxval && rgb.r != maxval)
+                    h += 4.0 + (rgb.r - rgb.g) / delta;
+                h *= 60.0;
+            }
+        }
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec3 col = texture2D(source, uv).rgb;
+            float h, s, l;
+            rgb2hsl(col, h, s, l);
+            float h2 = (h > targetHue) ? h - 360.0 : h + 360.0;
+            float y = 0.3 * col.r + 0.59 * col.g + 0.11 * col.b;
+            vec3 result;
+            if (uv.x > dividerValue || (abs(h - targetHue) < windowWidth) || (abs(h2 - targetHue) < windowWidth))
+                result = col;
+            else
+                result = vec3(y, y, y);
+            gl_FragColor = qt_Opacity * vec4(result, 1.0);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
new file mode 100644
index 0000000000..85f5953f4c
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://www.reddit.com/r/programming/comments/losip/shader_toy/c2upn1e
+
+import QtQuick 1.0
+
+Effect {
+    id: root
+
+    // Constant properties which must be supported by every effect
+    property int numParameters: 2
+    property bool supportsDivider: false
+
+    property real param1Value: 0.5
+    property real radius: 200 * param1Value
+
+    property real param2Value: 0.5
+    property real diffractionIndex: param2Value
+
+    property real posX: -1
+    property real posY: -1
+
+    onTargetWidthChanged: if (posX == -1) posX = targetWidth / 2
+    onTargetHeightChanged: if (posY == -1) posY = targetHeight / 2
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+        uniform float radius;
+        uniform float diffractionIndex;
+        uniform float targetWidth;
+        uniform float targetHeight;
+        uniform float posX;
+        uniform float posY;
+
+        void main()
+        {
+            float h = diffractionIndex * 0.5 * radius;
+            vec2 targetSize = vec2(targetWidth, targetHeight);
+            vec2 center = vec2(posX, posY);
+            vec2 xy = gl_FragCoord.xy - center.xy;
+            float r = sqrt(xy.x * xy.x + xy.y * xy.y);
+            vec2 new_xy = r < radius ? xy * (radius - h) / sqrt(radius * radius - r * r) : xy;
+            gl_FragColor = qt_Opacity * texture2D(source, (new_xy + center) / targetSize);
+        }"
+
+    MouseArea {
+        anchors.fill: parent
+        onPositionChanged: { root.posX = mouse.x; root.posY = root.targetHeight - mouse.y }
+    }
+}
+
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
new file mode 100644
index 0000000000..9beb806cac
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
@@ -0,0 +1,197 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://rectalogic.github.com/webvfx/examples_2transition-shader-pagecurl_8html-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: false
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real curlExtent: 1.0 - param1Value
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        uniform float curlExtent;
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        const float minAmount = -0.16;
+        const float maxAmount = 1.3;
+        const float PI = 3.141592653589793;
+        const float scale = 512.0;
+        const float sharpness = 3.0;
+        const vec4 bgColor = vec4(1.0, 1.0, 0.8, 1.0);
+
+        float amount = curlExtent * (maxAmount - minAmount) + minAmount;
+        float cylinderCenter = amount;
+        // 360 degrees * amount
+        float cylinderAngle = 2.0 * PI * amount;
+        const float cylinderRadius = 1.0 / PI / 2.0;
+
+        vec3 hitPoint(float hitAngle, float yc, vec3 point, mat3 rrotation)
+        {
+            float hitPoint = hitAngle / (2.0 * PI);
+            point.y = hitPoint;
+            return rrotation * point;
+        }
+
+        vec4 antiAlias(vec4 color1, vec4 color2, float distance)
+        {
+            distance *= scale;
+            if (distance < 0.0) return color2;
+            if (distance > 2.0) return color1;
+            float dd = pow(1.0 - distance / 2.0, sharpness);
+            return ((color2 - color1) * dd) + color1;
+        }
+
+        float distanceToEdge(vec3 point)
+        {
+            float dx = abs(point.x > 0.5 ? 1.0 - point.x : point.x);
+            float dy = abs(point.y > 0.5 ? 1.0 - point.y : point.y);
+            if (point.x < 0.0) dx = -point.x;
+            if (point.x > 1.0) dx = point.x - 1.0;
+            if (point.y < 0.0) dy = -point.y;
+            if (point.y > 1.0) dy = point.y - 1.0;
+            if ((point.x < 0.0 || point.x > 1.0) && (point.y < 0.0 || point.y > 1.0)) return sqrt(dx * dx + dy * dy);
+            return min(dx, dy);
+        }
+
+        vec4 seeThrough(float yc, vec2 p, mat3 rotation, mat3 rrotation)
+        {
+            float hitAngle = PI - (acos(yc / cylinderRadius) - cylinderAngle);
+            vec3 point = hitPoint(hitAngle, yc, rotation * vec3(p, 1.0), rrotation);
+            if (yc <= 0.0 && (point.x < 0.0 || point.y < 0.0 || point.x > 1.0 || point.y > 1.0))
+                return bgColor;
+            if (yc > 0.0)
+                return texture2D(source, p);
+            vec4 color = texture2D(source, point.xy);
+            vec4 tcolor = vec4(0.0);
+            return antiAlias(color, tcolor, distanceToEdge(point));
+        }
+
+        vec4 seeThroughWithShadow(float yc, vec2 p, vec3 point, mat3 rotation, mat3 rrotation)
+        {
+            float shadow = distanceToEdge(point) * 30.0;
+            shadow = (1.0 - shadow) / 3.0;
+            if (shadow < 0.0)
+                shadow = 0.0;
+            else
+                shadow *= amount;
+            vec4 shadowColor = seeThrough(yc, p, rotation, rrotation);
+            shadowColor.r -= shadow;
+            shadowColor.g -= shadow;
+            shadowColor.b -= shadow;
+            return shadowColor;
+        }
+
+        vec4 backside(float yc, vec3 point)
+        {
+            vec4 color = texture2D(source, point.xy);
+            float gray = (color.r + color.b + color.g) / 15.0;
+            gray += (8.0 / 10.0) * (pow(1.0 - abs(yc / cylinderRadius), 2.0 / 10.0) / 2.0 + (5.0 / 10.0));
+            color.rgb = vec3(gray);
+            return color;
+        }
+
+        void main(void)
+        {
+            const float angle = 30.0 * PI / 180.0;
+            float c = cos(-angle);
+            float s = sin(-angle);
+            mat3 rotation = mat3(
+                c, s, 0,
+                -s, c, 0,
+                0.12, 0.258, 1
+            );
+            c = cos(angle);
+            s = sin(angle);
+            mat3 rrotation = mat3(
+                c, s, 0,
+                -s, c, 0,
+                0.15, -0.5, 1
+            );
+            vec3 point = rotation * vec3(qt_TexCoord0, 1.0);
+            float yc = point.y - cylinderCenter;
+            vec4 color = vec4(1.0, 0.0, 0.0, 1.0);
+            if (yc < -cylinderRadius) {
+                // See through to background
+                color = bgColor;
+            } else if (yc > cylinderRadius) {
+                // Flat surface
+                color = texture2D(source, qt_TexCoord0);
+            } else {
+                float hitAngle = (acos(yc / cylinderRadius) + cylinderAngle) - PI;
+                float hitAngleMod = mod(hitAngle, 2.0 * PI);
+                if ((hitAngleMod > PI && amount < 0.5) || (hitAngleMod > PI/2.0 && amount < 0.0)) {
+                    color = seeThrough(yc, qt_TexCoord0, rotation, rrotation);
+                } else {
+                    point = hitPoint(hitAngle, yc, point, rrotation);
+                    if (point.x < 0.0 || point.y < 0.0 || point.x > 1.0 || point.y > 1.0) {
+                        color = seeThroughWithShadow(yc, qt_TexCoord0, point, rotation, rrotation);
+                    } else {
+                        color = backside(yc, point);
+                        vec4 otherColor;
+                        if (yc < 0.0) {
+                            float shado = 1.0 - (sqrt(pow(point.x - 0.5, 2.0) + pow(point.y - 0.5, 2.0)) / 0.71);
+                            shado *= pow(-yc / cylinderRadius, 3.0);
+                            shado *= 0.5;
+                            otherColor = vec4(0.0, 0.0, 0.0, shado);
+                        } else {
+                            otherColor = texture2D(source, qt_TexCoord0);
+                        }
+                        color = antiAlias(color, otherColor, cylinderRadius - abs(yc));
+
+                        // This second antialiasing step causes the shader to fail to render, on
+                        // Symbian devices (tested so far using IVE3.5).  Running out of scratch
+                        // memory?
+                        /*
+                        vec4 cl = seeThroughWithShadow(yc, qt_TexCoord0, point, rotation, rrotation);
+                        float dist = distanceToEdge(point);
+                        color = antiAlias(color, cl, dist);
+                        */
+                    }
+                }
+            }
+            gl_FragColor = qt_Opacity * color;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
new file mode 100644
index 0000000000..657ce93474
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
new file mode 100644
index 0000000000..03e04f8daa
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20101029/shader-library-pixelation-post-processing-effect-glsl/
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real granularity: param1Value * 20
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        uniform float granularity;
+        uniform float targetWidth;
+        uniform float targetHeight;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec2 tc = qt_TexCoord0;
+            if (uv.x < dividerValue && granularity > 0.0) {
+                float dx = granularity / targetWidth;
+                float dy = granularity / targetHeight;
+                tc = vec2(dx*(floor(uv.x/dx) + 0.5),
+                          dy*(floor(uv.y/dy) + 0.5));
+            }
+            gl_FragColor = qt_Opacity * texture2D(source, tc);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
new file mode 100644
index 0000000000..ae6ec989b2
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20091027/shader-library-posterization-post-processing-effect-glsl/
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real gamma: param1Value
+    property real numColors: 8.0
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        uniform float gamma;
+        uniform float numColors;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec4 c = vec4(0.0);
+            if (uv.x < dividerValue) {
+                vec3 x = texture2D(source, uv).rgb;
+                x = pow(x, vec3(gamma, gamma, gamma));
+                x = x * numColors;
+                x = floor(x);
+                x = x / numColors;
+                x = pow(x, vec3(1.0/gamma));
+                c = vec4(x, 1.0);
+            } else {
+                c = texture2D(source, uv);
+            }
+            gl_FragColor = qt_Opacity * c;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
new file mode 100644
index 0000000000..4f39dd49eb
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://labs.qt.nokia.com/2011/03/22/the-convenient-power-of-qml-scene-graph/
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 2
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real param2Value: 0.5
+    property real dividerValue: 0.5
+
+    property real time: 0
+
+    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
+
+    property real amplitude: param1Value * 0.03
+    property real n: param2Value * 7
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        uniform float targetWidth;
+        uniform float targetHeight;
+        uniform float time;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        const float PI = 3.1415926535;
+        const int ITER = 7;
+        const float RATE = 0.1;
+        uniform float amplitude;
+        uniform float n;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec2 tc = uv;
+            vec2 p = vec2(-1.0 + 2.0 * gl_FragCoord.x / targetWidth, -1.0 + 2.0 * gl_FragCoord.y / targetHeight);
+            float diffx = 0.0;
+            float diffy = 0.0;
+            vec4 col;
+            if (uv.x < dividerValue) {
+                for (int i=0; i<ITER; ++i) {
+                    float theta = float(i) * PI / float(ITER);
+                    vec2 r = vec2(cos(theta) * p.x + sin(theta) * p.y, -1.0 * sin(theta) * p.x + cos(theta) * p.y);
+                    float diff = (sin(2.0 * PI * n * (r.y + time * RATE)) + 1.0) / 2.0;
+                    diffx += diff * sin(theta);
+                    diffy += diff * cos(theta);
+                }
+                tc = 0.5*(vec2(1.0,1.0) + p) + amplitude * vec2(diffx, diffy);
+            }
+            gl_FragColor = qt_Opacity * texture2D(source, tc);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
new file mode 100644
index 0000000000..212b55b6fb
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    property int itemHeight: 25
+    property string effectSource: ""
+
+    signal clicked
+
+    QtObject {
+        id: d
+        property Item selectedItem
+    }
+
+    ListModel {
+        id: sources
+        ListElement { name: "No effect"; source: "EffectPassThrough.qml" }
+        ListElement { name: "Billboard"; source: "EffectBillboard.qml" }
+        ListElement { name: "Black & white"; source: "EffectBlackAndWhite.qml" }
+        ListElement { name: "Blur"; source: "EffectGaussianBlur.qml" }
+        ListElement { name: "Edge detection"; source: "EffectSobelEdgeDetection1.qml" }
+        //ListElement { name: "Edge detection (Sobel, #2)"; source: "EffectSobelEdgeDetection2.qml" }
+        ListElement { name: "Emboss"; source: "EffectEmboss.qml" }
+        ListElement { name: "Glow"; source: "EffectGlow.qml" }
+        ListElement { name: "Isolate"; source: "EffectIsolate.qml" }
+        ListElement { name: "Magnify"; source: "EffectMagnify.qml" }
+        ListElement { name: "Page curl"; source: "EffectPageCurl.qml" }
+        ListElement { name: "Pixelate"; source: "EffectPixelate.qml" }
+        ListElement { name: "Posterize"; source: "EffectPosterize.qml" }
+        ListElement { name: "Ripple"; source: "EffectRipple.qml" }
+        ListElement { name: "Sepia"; source: "EffectSepia.qml" }
+        ListElement { name: "Sharpen"; source: "EffectSharpen.qml" }
+        ListElement { name: "Shockwave"; source: "EffectShockwave.qml" }
+        ListElement { name: "Tilt shift"; source: "EffectTiltShift.qml" }
+        ListElement { name: "Toon"; source: "EffectToon.qml" }
+        ListElement { name: "Warhol"; source: "EffectWarhol.qml" }
+        ListElement { name: "Wobble"; source: "EffectWobble.qml" }
+        ListElement { name: "Vignette"; source: "EffectVignette.qml" }
+    }
+
+    Component {
+        id: sourceDelegate
+        Item {
+            id: sourceDelegateItem
+            width: root.width
+            height: itemHeight
+
+            Button {
+                id: sourceSelectorItem
+                anchors.centerIn: parent
+                width: 0.9 * parent.width
+                height: 0.8 * itemHeight
+                text: name
+                onClicked: {
+                    if (d.selectedItem)
+                        d.selectedItem.state = "baseState"
+                    d.selectedItem = sourceDelegateItem
+                    d.selectedItem.state = "selected"
+                    effectSource = source
+                    root.clicked()
+                }
+            }
+
+            states: [
+                State {
+                    name: "selected"
+                    PropertyChanges {
+                        target: sourceSelectorItem
+                        bgColor: "#ff8888"
+                    }
+                }
+            ]
+
+            Component.onCompleted: {
+                if (name == "No effect") {
+                    state = "selected"
+                    d.selectedItem = sourceDelegateItem
+                }
+            }
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    ColorAnimation {
+                        properties: "color"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+        }
+    }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: (itemHeight * sources.count) + layout.anchors.topMargin + layout.spacing
+        clip: true
+
+        Column {
+            id: layout
+
+            anchors {
+                fill: parent
+                topMargin: 10
+            }
+
+            Repeater {
+                model: sources
+                delegate: sourceDelegate
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
new file mode 100644
index 0000000000..43ab641353
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 0
+    property bool supportsDivider: true
+
+    property real dividerValue: 0.5
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec4 orig = texture2D(source, uv);
+            vec3 col = orig.rgb;
+            float y = 0.3 * col.r + 0.59 * col.g + 0.11 * col.b;
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(y + 0.15, y + 0.07, y - 0.12, 1.0);
+            else
+                gl_FragColor = qt_Opacity * orig;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
new file mode 100644
index 0000000000..911587a556
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real amount: 18.0 * param1Value
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        uniform float amount;
+        const float step_w = 0.0015625;
+        const float step_h = 0.0027778;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        vec3 sharpen(vec3 t1, vec3 t2, vec3 t3, vec3 t4, vec3 t5, vec3 t6, vec3 t7, vec3 t8, vec3 t9)
+        {
+            return -t1 - t2 - t3 - t4 + amount * t5 - t6 - t7 - t8 - t9;
+        }
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
+            vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
+            vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
+            vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
+            vec3 t5 = texture2D(source, uv).rgb;
+            vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
+            vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
+            vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
+            vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
+            vec3 col = sharpen(t1, t2, t3, t4, t5, t6, t7, t8, t9);
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(col, 1.0);
+            else
+                gl_FragColor = qt_Opacity * texture2D(source, uv);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
new file mode 100644
index 0000000000..8e01eaf211
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20091116/shader-library-2d-shockwave-post-processing-filter-glsl/
+
+import QtQuick 1.0
+
+Effect {
+    id: root
+
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real granularity: param1Value * 20
+
+    property real centerX
+    property real centerY
+    property real time
+
+    SequentialAnimation {
+        running: true
+        loops: Animation.Infinite
+        ScriptAction {
+            script: {
+                centerX = Math.random()
+                centerY = Math.random()
+            }
+        }
+        NumberAnimation {
+            target: root
+            property: "time"
+            from: 0
+            to: 1
+            duration: 1000
+        }
+    }
+
+    property real weight: param1Value
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float centerX;
+        uniform float centerY;
+        uniform float dividerValue;
+        uniform float granularity;
+        uniform float time;
+        uniform float weight;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec2 tc = qt_TexCoord0;
+            vec2 center = vec2(centerX, centerY);
+            const vec3 shock = vec3(10.0, 1.5, 0.1);
+            if (uv.x < dividerValue) {
+                float distance = distance(uv, center);
+                if ((distance <= (time + shock.z)) &&
+                    (distance >= (time - shock.z))) {
+                    float diff = (distance - time);
+                    float powDiff = 1.0 - pow(abs(diff*shock.x), shock.y*weight);
+                    float diffTime = diff  * powDiff;
+                    vec2 diffUV = normalize(uv - center);
+                    tc += (diffUV * diffTime);
+                }
+            }
+            gl_FragColor = qt_Opacity * texture2D(source, tc);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
new file mode 100644
index 0000000000..fc1bad07b0
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+// Based on "Graphics Shaders: Theory and Practice" (http://cgeducation.org/ShadersBook/)
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real mixLevel: param1Value
+    property real targetSize: 250 - (200 * param1Value) // TODO: fix ...
+    property real resS: targetSize
+    property real resT: targetSize
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        uniform float mixLevel;
+        uniform float resS;
+        uniform float resT;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec4 c = vec4(0.0);
+            if (uv.x < dividerValue) {
+                vec2 st = qt_TexCoord0.st;
+                vec3 irgb = texture2D(source, st).rgb;
+                vec2 stp0 = vec2(1.0 / resS, 0.0);
+                vec2 st0p = vec2(0.0       , 1.0 / resT);
+                vec2 stpp = vec2(1.0 / resS, 1.0 / resT);
+                vec2 stpm = vec2(1.0 / resS, -1.0 / resT);
+                const vec3 W = vec3(0.2125, 0.7154, 0.0721);
+                float i00   = dot(texture2D(source, st).rgb, W);
+                float im1m1 = dot(texture2D(source, st-stpp).rgb, W);
+                float ip1p1 = dot(texture2D(source, st+stpp).rgb, W);
+                float im1p1 = dot(texture2D(source, st-stpm).rgb, W);
+                float ip1m1 = dot(texture2D(source, st+stpm).rgb, W);
+                float im10  = dot(texture2D(source, st-stp0).rgb, W);
+                float ip10  = dot(texture2D(source, st+stp0).rgb, W);
+                float i0m1  = dot(texture2D(source, st-st0p).rgb, W);
+                float i0p1  = dot(texture2D(source, st+st0p).rgb, W);
+                float h = -1.0*im1p1 - 2.0*i0p1 - 1.0*ip1p1 + 1.0*im1m1 + 2.0*i0m1 + 1.0*ip1m1;
+                float v = -1.0*im1m1 - 2.0*im10 - 1.0*im1p1 + 1.0*ip1m1 + 2.0*ip10 + 1.0*ip1p1;
+                float mag = 1.0 - length(vec2(h, v));
+                vec3 target = vec3(mag, mag, mag);
+                c = vec4(target, 1.0);
+            } else {
+                c = texture2D(source, qt_TexCoord0);
+            }
+            gl_FragColor = qt_Opacity * c;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
new file mode 100644
index 0000000000..adf1a23826
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://rastergrid.com/blog/downloads/frei-chen-edge-detector/
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real weight: param1Value
+
+    fragmentShader: fragmentShaderCommon + "
+        #version 130
+        uniform sampler2D source;
+        uniform float dividerValue;
+        uniform float weight;
+        mat3 G[2] = mat3[](
+            mat3( 1.0, 2.0, 1.0, 0.0, 0.0, 0.0, -1.0, -2.0, -1.0 ),
+            mat3( 1.0, 0.0, -1.0, 2.0, 0.0, -2.0, 1.0, 0.0, -1.0 )
+        );
+        uniform lowp float qt_Opacity;
+        in vec2 qt_TexCoord0;
+        out vec4 FragmentColor;
+        void main() {
+            vec2 uv = qt_TexCoord0.xy;
+            vec4 c = vec4(0.0);
+            if (uv.x < dividerValue) {
+                mat3 intensity;
+                float conv[2];
+                vec3 sample;
+                for (int i=0; i<3; ++i) {
+                    for (int j=0; j<3; ++j) {
+                        sample = texelFetch(source, ivec2(gl_FragCoord) + ivec2(i-1, j-1), 0).rgb;
+                        intensity[i][j] = length(sample) * weight;
+                    }
+                }
+                for (int i=0; i<2; ++i) {
+                    float dp3 = dot(G[i][0], intensity[0]) + dot(G[i][1], intensity[1]) + dot(G[i][2], intensity[2]);
+                    conv[i] = dp3 * dp3;
+                }
+                c = vec4(0.5 * sqrt(conv[0]*conv[0] + conv[1]*conv[1]));
+            } else {
+                c = texture2D(source, qt_TexCoord0);
+            }
+            FragmentColor = qt_Opacity * c;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
new file mode 100644
index 0000000000..34ffbe4f9a
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 0
+    property bool supportsDivider: true
+
+    property real dividerValue: 0.5
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        const float step_w = 0.0015625;
+        const float step_h = 0.0027778;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        vec3 blur()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            float y = uv.y < 0.4 ? uv.y : 1.0 - uv.y;
+            float dist = 8.0 - 20.0 * y;
+            vec3 acc = vec3(0.0, 0.0, 0.0);
+            for (float y=-2.0; y<=2.0; ++y) {
+                for (float x=-2.0; x<=2.0; ++x) {
+                    acc += texture2D(source, vec2(uv.x + dist * x * step_w, uv.y + 0.5 * dist * y * step_h)).rgb;
+                }
+            }
+            return acc / 25.0;
+        }
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec3 col;
+            if (uv.x < dividerValue && uv.y >= 0.4 && uv.y <= 0.6)
+                col = texture2D(source, uv).rgb;
+            else
+                col = blur();
+            gl_FragColor = qt_Opacity * vec4(col, 1.0);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
new file mode 100644
index 0000000000..87fd787e11
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20101029/shader-library-pixelation-post-processing-effect-glsl/
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real threshold: param1Value
+    property real targetSize: 250 - (200 * param1Value) // TODO: fix ...
+    property real resS: targetSize
+    property real resT: targetSize
+
+    // TODO
+    property real magTol: 0.3
+    property real quantize: 8.0
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+        uniform float threshold;
+        uniform float resS;
+        uniform float resT;
+        uniform float magTol;
+        uniform float quantize;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec4 color = vec4(1.0, 0.0, 0.0, 1.1);
+            vec2 uv = qt_TexCoord0.xy;
+            if (uv.x < dividerValue) {
+                vec2 st = qt_TexCoord0.st;
+                vec3 rgb = texture2D(source, st).rgb;
+                vec2 stp0 = vec2(1.0/resS,  0.0);
+                vec2 st0p = vec2(0.0     ,  1.0/resT);
+                vec2 stpp = vec2(1.0/resS,  1.0/resT);
+                vec2 stpm = vec2(1.0/resS, -1.0/resT);
+                float i00 =   dot( texture2D(source, st).rgb, vec3(0.2125,0.7154,0.0721));
+                float im1m1 = dot( texture2D(source, st-stpp).rgb, vec3(0.2125,0.7154,0.0721));
+                float ip1p1 = dot( texture2D(source, st+stpp).rgb, vec3(0.2125,0.7154,0.0721));
+                float im1p1 = dot( texture2D(source, st-stpm).rgb, vec3(0.2125,0.7154,0.0721));
+                float ip1m1 = dot( texture2D(source, st+stpm).rgb, vec3(0.2125,0.7154,0.0721));
+                float im10 =  dot( texture2D(source, st-stp0).rgb, vec3(0.2125,0.7154,0.0721));
+                float ip10 =  dot( texture2D(source, st+stp0).rgb, vec3(0.2125,0.7154,0.0721));
+                float i0m1 =  dot( texture2D(source, st-st0p).rgb, vec3(0.2125,0.7154,0.0721));
+                float i0p1 =  dot( texture2D(source, st+st0p).rgb, vec3(0.2125,0.7154,0.0721));
+                float h = -1.*im1p1 - 2.*i0p1 - 1.*ip1p1  +  1.*im1m1 + 2.*i0m1 + 1.*ip1m1;
+                float v = -1.*im1m1 - 2.*im10 - 1.*im1p1  +  1.*ip1m1 + 2.*ip10 + 1.*ip1p1;
+                float mag = sqrt(h*h + v*v);
+                if (mag > magTol) {
+                    color = vec4(0.0, 0.0, 0.0, 1.0);
+                }
+                else {
+                    rgb.rgb *= quantize;
+                    rgb.rgb += vec3(0.5, 0.5, 0.5);
+                    ivec3 irgb = ivec3(rgb.rgb);
+                    rgb.rgb = vec3(irgb) / quantize;
+                    color = vec4(rgb, 1.0);
+                }
+            } else {
+                color = texture2D(source, uv);
+            }
+            gl_FragColor = qt_Opacity * color;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
new file mode 100644
index 0000000000..7e6ec06076
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 0
+    property bool supportsDivider: true
+
+    property real dividerValue: 0.5
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec4 orig = texture2D(source, uv);
+            float cr = pow(0.1, 2.0);
+            float pt = pow(uv.x - 0.5, 2.0) + pow(uv.y - 0.5, 2.0);
+            float d = pt - cr;
+            float cf = 1.0;
+            if (d > 0.0)
+                cf = 1.0 - 2.0 * d;
+            vec3 col = cf * orig.rgb;
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(col, 1.0);
+            else
+                gl_FragColor = qt_Opacity * orig;
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
new file mode 100644
index 0000000000..dead59af7a
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 0
+    property bool supportsDivider: true
+
+    property real dividerValue: 0.5
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float dividerValue;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec4 orig = texture2D(source, uv);
+            vec3 col = orig.rgb;
+            float y = 0.3 *col.r + 0.59 * col.g + 0.11 * col.b;
+            y = y < 0.3 ? 0.0 : (y < 0.6 ? 0.5 : 1.0);
+            if (y == 0.5)
+                col = vec3(0.8, 0.0, 0.0);
+            else if (y == 1.0)
+                col = vec3(0.9, 0.9, 0.0);
+            else
+                col = vec3(0.0, 0.0, 0.0);
+            if (uv.x < dividerValue)
+                gl_FragColor = qt_Opacity * vec4(col, 1.0);
+            else
+                gl_FragColor = qt_Opacity * orig;
+        }"
+}
+
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
new file mode 100644
index 0000000000..7dad9a7fde
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Based on http://labs.qt.nokia.com/2011/03/22/the-convenient-power-of-qml-scene-graph/
+
+import QtQuick 1.0
+
+Effect {
+    // Constant properties which must be supported by every effect
+    property int numParameters: 1
+    property bool supportsDivider: true
+
+    property real param1Value: 0.5
+    property real dividerValue: 0.5
+
+    property real amplitude: param1Value * 0.05
+    property real frequency: 20
+    property real time: 0
+
+    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
+
+    fragmentShader: fragmentShaderCommon + "
+        uniform float amplitude;
+        uniform float dividerValue;
+        uniform float frequency;
+        uniform float time;
+
+        uniform sampler2D source;
+        uniform lowp float qt_Opacity;
+        varying vec2 qt_TexCoord0;
+
+        void main()
+        {
+            vec2 uv = qt_TexCoord0.xy;
+            vec2 tc = qt_TexCoord0;
+            if (uv.x < dividerValue) {
+                vec2 p = sin(time + frequency * qt_TexCoord0);
+                tc += amplitude * vec2(p.y, -p.x);
+            }
+            gl_FragColor = qt_Opacity * texture2D(source, tc);
+        }"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/demos/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
new file mode 100644
index 0000000000..69141007bd
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
@@ -0,0 +1,349 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.folderlistmodel 1.0
+
+Rectangle {
+    id: root
+    color: "white"
+    property bool showFocusHighlight: false
+    property variant folders: folders1
+    property variant view: view1
+    property alias folder: folders1.folder
+    property color textColor: "black"
+
+    signal openFile(string path)
+
+    FolderListModel {
+        id: folders1
+        folder: folder
+    }
+
+    FolderListModel {
+        id: folders2
+        folder: folder
+    }
+
+    SystemPalette {
+        id: palette
+    }
+
+    Component {
+        id: folderDelegate
+
+        Rectangle {
+            id: wrapper
+            function launch() {
+                if (folders.isFolder(index))
+                    down(filePath);
+                else
+                    root.openFile(filePath);
+            }
+            width: root.width
+            height: 52
+            color: "transparent"
+
+            Rectangle {
+                id: highlight; visible: false
+                anchors.fill: parent
+                color: palette.highlight
+                gradient: Gradient {
+                    GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                    GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                }
+            }
+
+            Item {
+                width: 48; height: 48
+                Image {
+                    source: "qrc:/images/folder.png"
+                    anchors.centerIn: parent
+                    visible: folders.isFolder(index)
+                }
+            }
+
+            Text {
+                id: nameText
+                anchors.fill: parent; verticalAlignment: Text.AlignVCenter
+                text: fileName
+                anchors.leftMargin: 54
+                font.pixelSize: 32
+                color: (wrapper.ListView.isCurrentItem && root.showFocusHighlight) ? palette.highlightedText : textColor
+                elide: Text.ElideRight
+            }
+
+            MouseArea {
+                id: mouseRegion
+                anchors.fill: parent
+                onPressed: {
+                    root.showFocusHighlight = false;
+                    wrapper.ListView.view.currentIndex = index;
+                }
+                onClicked: { if (folders == wrapper.ListView.view.model) launch() }
+            }
+
+            states: [
+                State {
+                    name: "pressed"
+                    when: mouseRegion.pressed
+                    PropertyChanges { target: highlight; visible: true }
+                    PropertyChanges { target: nameText; color: palette.highlightedText }
+                }
+            ]
+        }
+    }
+
+    Rectangle {
+        id: cancelButton
+        width: 100
+        height: titleBar.height - 7
+        color: "black"
+        anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter }
+
+        Text {
+            anchors { fill: parent; margins: 4 }
+            text: "Cancel"
+            color: "white"
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            font.pixelSize: 20
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.openFile("")
+        }
+    }
+
+    ListView {
+        id: view1
+        anchors.top: titleBar.bottom
+        anchors.bottom: cancelButton.top
+        x: 0
+        width: parent.width
+        model: folders1
+        delegate: folderDelegate
+        highlight: Rectangle {
+            color: palette.highlight
+            visible: root.showFocusHighlight && view1.count != 0
+            gradient: Gradient {
+                GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+            }
+            width: view1.currentItem == null ? 0 : view1.currentItem.width
+        }
+        highlightMoveSpeed: 1000
+        pressDelay: 100
+        focus: true
+        state: "current"
+        states: [
+            State {
+                name: "current"
+                PropertyChanges { target: view1; x: 0 }
+            },
+            State {
+                name: "exitLeft"
+                PropertyChanges { target: view1; x: -root.width }
+            },
+            State {
+                name: "exitRight"
+                PropertyChanges { target: view1; x: root.width }
+            }
+        ]
+        transitions: [
+            Transition {
+                to: "current"
+                SequentialAnimation {
+                    NumberAnimation { properties: "x"; duration: 250 }
+                }
+            },
+            Transition {
+                NumberAnimation { properties: "x"; duration: 250 }
+                NumberAnimation { properties: "x"; duration: 250 }
+            }
+        ]
+        Keys.onPressed: root.keyPressed(event.key)
+    }
+
+    ListView {
+        id: view2
+        anchors.top: titleBar.bottom
+        anchors.bottom: parent.bottom
+        x: parent.width
+        width: parent.width
+        model: folders2
+        delegate: folderDelegate
+        highlight: Rectangle {
+            color: palette.highlight
+            visible: root.showFocusHighlight && view2.count != 0
+            gradient: Gradient {
+                GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+            }
+            width: view1.currentItem == null ? 0 : view1.currentItem.width
+        }
+        highlightMoveSpeed: 1000
+        pressDelay: 100
+        states: [
+            State {
+                name: "current"
+                PropertyChanges { target: view2; x: 0 }
+            },
+            State {
+                name: "exitLeft"
+                PropertyChanges { target: view2; x: -root.width }
+            },
+            State {
+                name: "exitRight"
+                PropertyChanges { target: view2; x: root.width }
+            }
+        ]
+        transitions: [
+            Transition {
+                to: "current"
+                SequentialAnimation {
+                    NumberAnimation { properties: "x"; duration: 250 }
+                }
+            },
+            Transition {
+                NumberAnimation { properties: "x"; duration: 250 }
+            }
+        ]
+        Keys.onPressed: root.keyPressed(event.key)
+    }
+
+    Keys.onPressed: {
+        root.keyPressed(event.key);
+        if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
+            view.currentItem.launch();
+            event.accepted = true;
+        } else if (event.key == Qt.Key_Left) {
+            up();
+        }
+    }
+
+    BorderImage {
+        source: "qrc:/images/titlebar.sci";
+        width: parent.width;
+        height: 52
+        y: -7
+        id: titleBar
+
+        Rectangle {
+            id: upButton
+            width: 48
+            height: titleBar.height - 7
+            color: "transparent"
+            Image { anchors.centerIn: parent; source: "qrc:/images/up.png" }
+            MouseArea { id: upRegion; anchors.centerIn: parent
+                width: 56
+                height: 56
+                onClicked: if (folders.parentFolder != "") up()
+            }
+            states: [
+                State {
+                    name: "pressed"
+                    when: upRegion.pressed
+                    PropertyChanges { target: upButton; color: palette.highlight }
+                }
+            ]
+        }
+
+        Rectangle {
+            color: "gray"
+            x: 48
+            width: 1
+            height: 44
+        }
+
+        Text {
+            anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
+            anchors.leftMargin: 4; anchors.rightMargin: 4
+            text: folders.folder
+            color: "white"
+            elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
+            font.pixelSize: 32
+        }
+    }
+
+    function down(path) {
+        if (folders == folders1) {
+            view = view2
+            folders = folders2;
+            view1.state = "exitLeft";
+        } else {
+            view = view1
+            folders = folders1;
+            view2.state = "exitLeft";
+        }
+        view.x = root.width;
+        view.state = "current";
+        view.focus = true;
+        folders.folder = path;
+    }
+
+    function up() {
+        var path = folders.parentFolder;
+        if (folders == folders1) {
+            view = view2
+            folders = folders2;
+            view1.state = "exitRight";
+        } else {
+            view = view1
+            folders = folders1;
+            view2.state = "exitRight";
+        }
+        view.x = -root.width;
+        view.state = "current";
+        view.focus = true;
+        folders.folder = path;
+    }
+
+    function keyPressed(key) {
+        switch (key) {
+            case Qt.Key_Up:
+            case Qt.Key_Down:
+            case Qt.Key_Left:
+            case Qt.Key_Right:
+                root.showFocusHighlight = true;
+            break;
+            default:
+                // do nothing
+            break;
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
new file mode 100644
index 0000000000..f846ff7141
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "white"
+    property int buttonHeight: 35
+
+    signal openImage
+    signal openVideo
+    signal openCamera
+    signal close
+
+    Rectangle {
+        anchors {
+            topMargin: 10
+            bottomMargin: 10
+            top: parent.top;
+            bottom: parent.bottom;
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: 0.9 * parent.width
+        color: "transparent"
+
+        Column {
+            anchors.fill: parent
+            spacing: 5
+            Button {
+                text: "Open image"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.openImage()
+            }
+            Button {
+                text: "Open video"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.openVideo()
+            }
+            Button {
+                text: "Start camera"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.openCamera()
+            }
+            Button {
+                text: "Reset"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.close()
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml b/demos/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
new file mode 100644
index 0000000000..6dc6672e86
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// Mouse area which flashes to indicate its location on the screen
+
+import QtQuick 1.0
+
+MouseArea {
+    property alias hintColor: hintRect.color
+    property bool hintEnabled: true
+
+    Rectangle {
+        id: hintRect
+        anchors.fill: parent
+        color: "yellow"
+        opacity: 0
+
+        states: [
+            State {
+                name: "high"
+                PropertyChanges {
+                    target: hintRect
+                    opacity: 0.8
+                }
+            },
+            State {
+                name: "low"
+                PropertyChanges {
+                    target: hintRect
+                    opacity: 0.4
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "low"
+                to: "high"
+                SequentialAnimation {
+                    NumberAnimation {
+                        properties: "opacity"
+                        easing.type: Easing.InOutSine
+                        duration: 500
+                    }
+                    ScriptAction { script: hintRect.state = "low" }
+                }
+            },
+            Transition {
+                from: "*"
+                to: "low"
+                SequentialAnimation {
+                    NumberAnimation {
+                        properties: "opacity"
+                        easing.type: Easing.InOutSine
+                        duration: 500
+                    }
+                    ScriptAction { script: hintRect.state = "high" }
+                }
+            },
+            Transition {
+                from: "*"
+                to: "baseState"
+                NumberAnimation {
+                    properties: "opacity"
+                    easing.type: Easing.InOutSine
+                    duration: 500
+                }
+            }
+        ]
+    }
+
+    onHintEnabledChanged: hintRect.state = hintEnabled ? "low" : "baseState"
+
+    Component.onCompleted: hintRect.state = "low"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
new file mode 100644
index 0000000000..c8ca1a7e3a
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "transparent"
+    height: numParameters * sliderHeight + (numParameters + 1) * spacing
+    visible: numParameters > 0
+    property color lineColor: "black"
+    property int numParameters: 1
+    property alias param1Value: slider1.value
+    property alias param2Value: slider2.value
+    property bool enabled: true
+    property real gripSize: 25
+    property real spacing: 10
+    property real sliderHeight: 40
+
+    Slider {
+        id: slider1
+        color: "white"
+        enabled: parent.enabled
+        gripSize: root.gripSize
+        height: sliderHeight
+        visible: enabled
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: (root.numParameters == 1) ? root.bottom : slider2.top
+            margins: root.spacing
+        }
+    }
+
+    Slider {
+        id: slider2
+        color: "white"
+        enabled: parent.enabled && root.numParameters >= 2
+        gripSize: root.gripSize
+        height: sliderHeight
+        visible: enabled
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: root.bottom
+            margins: root.spacing
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Slider.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Slider.qml
new file mode 100644
index 0000000000..b4bbbc8cf5
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Slider.qml
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "white"
+    radius: 5
+    property alias value: grip.value
+    property color lineColor: "black"
+    property alias gripSize: grip.width
+    property alias enabled: mouseArea.enabled
+
+    Rectangle {
+        anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter }
+        height: 3
+        color: displayedColor()
+
+        Rectangle {
+            anchors { fill: parent; margins: 1 }
+            color: root.color
+        }
+    }
+
+    Rectangle {
+        id: grip
+        property real value: 0.5
+        x: (value * parent.width) - width/2
+        anchors.verticalCenter: parent.verticalCenter
+        width: 20
+        height: width
+        radius: width/2
+        color: displayedColor()
+
+        MouseArea {
+            id: mouseArea
+            anchors.fill:  parent
+            drag {
+                target: grip
+                axis: Drag.XAxis
+                minimumX: -parent.width/2
+                maximumX: root.width - parent.width/2
+            }
+            onPositionChanged:  {
+                if (drag.active)
+                    updatePosition()
+            }
+            onReleased: {
+                updatePosition()
+            }
+            function updatePosition() {
+                value = (grip.x + grip.width/2) / grip.parent.width
+            }
+        }
+
+        Rectangle {
+            anchors { fill: parent; margins: 1 }
+            radius: width/2
+            color: root.color
+        }
+    }
+
+    function displayedColor() {
+        var tint = Qt.rgba(color.r, color.g, color.b, 0.25)
+        return enabled ? lineColor : Qt.tint(color, tint)
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
new file mode 100644
index 0000000000..f50e5dce03
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
@@ -0,0 +1,200 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    width: 900
+    height: 600
+    color: "grey"
+    property string fileName
+    property alias volume: content.volume
+    property bool perfMonitorsLogging: false
+    property bool perfMonitorsVisible: false
+
+    QtObject {
+        id: d
+        property string openFileType
+    }
+
+    Rectangle {
+        id: inner
+        anchors.fill: parent
+        color: "grey"
+
+        Content {
+            id: content
+            anchors {
+                top: parent.top
+                left: parent.left
+                margins: 5
+            }
+            width: 600
+            height: 600
+        }
+
+        Loader {
+            id: performanceLoader
+            function init() {
+                console.log("[qmlvideofx] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible)
+                var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible
+                source = enabled ? "../performancemonitor/PerformanceItem.qml" : ""
+            }
+            onLoaded: {
+                item.parent = content
+                item.anchors.top = content.top
+                item.anchors.left = content.left
+                item.anchors.right = content.right
+                item.height = content.height / 2
+                item.anchors.margins = 5
+                item.logging = root.perfMonitorsLogging
+                item.displayed = root.perfMonitorsVisible
+                item.init()
+            }
+        }
+
+        ParameterPanel {
+            id: parameterPanel
+            enabled: numParameters >= 1
+            numParameters: content.effect ? content.effect.numParameters : 0
+            anchors {
+                top: content.bottom
+                left: parent.left
+                bottom: parent.bottom
+            }
+            width: content.width
+            onParam1ValueChanged: updateParameters()
+        }
+
+        EffectSelectionPanel {
+            id: effectSelectionPanel
+            anchors {
+                top: parent.top
+                left: content.right
+                right: parent.right
+                margins: 5
+            }
+            height: 420
+            itemHeight: 40
+             onEffectSourceChanged: {
+                content.effectSource = effectSource
+                updateParameters()
+            }
+        }
+
+        FileOpen {
+            id: fileOpen
+            anchors {
+                top: effectSelectionPanel.bottom
+                left: content.right
+                right: parent.right
+                bottom: parent.bottom
+                margins: 5
+            }
+            buttonHeight: 32
+        }
+    }
+
+    Loader {
+        id: fileBrowserLoader
+    }
+
+    Component.onCompleted: {
+        fileOpen.openImage.connect(openImage)
+        fileOpen.openVideo.connect(openVideo)
+        fileOpen.openCamera.connect(openCamera)
+        fileOpen.close.connect(close)
+    }
+
+    function init() {
+        console.log("[qmlvideofx] main.init")
+        content.init()
+        performanceLoader.init()
+        if (fileName != "") {
+            d.openFileType = "video"
+            openFile(fileName)
+        }
+    }
+
+    function qmlFramePainted() {
+        if (performanceLoader.item)
+            performanceLoader.item.qmlFramePainted()
+    }
+
+    function updateParameters() {
+        if (content.effect.numParameters >= 1)
+            content.effect.param1Value = parameterPanel.param1Value
+    }
+
+    function openImage() {
+        d.openFileType = "image"
+        showFileBrowser("../../images")
+    }
+
+    function openVideo() {
+        d.openFileType = "video"
+        showFileBrowser("../../videos")
+    }
+
+    function openCamera() {
+        content.openCamera()
+    }
+
+    function close() {
+        content.openImage("qrc:/images/qt-logo.png")
+    }
+
+    function showFileBrowser(path) {
+        fileBrowserLoader.source = "FileBrowser.qml"
+        fileBrowserLoader.item.parent = root
+        fileBrowserLoader.item.anchors.fill = root
+        fileBrowserLoader.item.openFile.connect(root.openFile)
+        fileBrowserLoader.item.folder = path
+        inner.visible = false
+    }
+
+    function openFile(path) {
+        fileBrowserLoader.source = ""
+        if (path != "") {
+            if (d.openFileType == "image")
+                content.openImage(path)
+            else if (d.openFileType == "video")
+                content.openVideo(path)
+        }
+        inner.visible = true
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
new file mode 100644
index 0000000000..8499dc8c6f
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
@@ -0,0 +1,411 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    width: 640
+    height: 360
+    color: "grey"
+    property string fileName
+    property alias volume: content.volume
+    property bool perfMonitorsLogging: false
+    property bool perfMonitorsVisible: false
+
+    QtObject {
+        id: d
+        property string openFileType
+    }
+
+    // Create ScreenSaver element via Loader, so this app will still run if the
+    // SystemInfo module is not available
+    Loader {
+        source: "DisableScreenSaver.qml"
+    }
+
+    Loader {
+        id: performanceLoader
+        function init() {
+            console.log("[qmlvideofx] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible)
+            var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible
+            source = enabled ? "../performancemonitor/PerformanceItem.qml" : ""
+        }
+        onLoaded: {
+            item.parent = root
+            item.anchors.fill = root
+            item.logging = root.perfMonitorsLogging
+            item.displayed = root.perfMonitorsVisible
+            item.init()
+        }
+    }
+
+    Rectangle {
+        id: inner
+        anchors.fill: parent
+        color: "grey"
+
+        Content {
+            id: content
+            anchors.fill: parent
+            gripSize: 40
+            onVideoFramePainted: performanceLoader.item.videoFramePainted()
+        }
+
+        ParameterPanel {
+            id: parameterPanel
+
+            anchors {
+                left: parent.left;
+                right: parent.right;
+                margins: 10
+            }
+            numParameters: content.effect.numParameters
+            y: parent.height
+            opacity: 0.75
+            gripSize: 40
+
+            states: [
+                State {
+                    name: "shown"
+                    PropertyChanges {
+                        target: parameterPanel
+                        y: parent.height - (parameterPanel.height + 10)
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "y"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+
+            enabled: content.effect.numParameters >= 1 && effectSelectionPanel.state != "shown"
+            state: enabled ? "shown" : "baseState"
+            onParam1ValueChanged: updateParameters()
+            onParam2ValueChanged: updateParameters()
+        }
+
+        EffectSelectionPanel {
+            id: effectSelectionPanel
+            anchors {
+                top: parent.top;
+                bottom: parameterPanel.top;
+                margins: 10
+            }
+            x: parent.width
+            width: parent.width - 40
+            opacity: 0.75
+            radius: 20
+            itemHeight: 50
+
+            states: [
+                State {
+                    name: "shown"
+                    PropertyChanges {
+                        target: effectSelectionPanel
+                        x: 20
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "x"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+
+            onEffectSourceChanged: {
+                content.effectSource = effectSource
+                parameterPanel.numParameters = content.effect.numParameters
+                updateParameters()
+            }
+
+            onClicked: state = "baseState"
+        }
+
+        Rectangle {
+            id: fileOpenContainer
+            anchors {
+                top: parent.top
+                bottom: parameterPanel.top
+                margins: 10
+            }
+            x: -width
+            width: parent.width - 40
+            color: "transparent"
+
+            Column {
+                anchors.fill: parent
+
+                FileOpen {
+                    id: fileOpen
+                    color: "transparent"
+                    width: parent.width
+                    height: 200
+                    opacity: 0.75
+                    radius: 20
+                    buttonHeight: 40
+                }
+
+                MouseArea {
+                    width: parent.width
+                    height: 250
+                    onClicked: fileOpenContainer.state = "baseState"
+                }
+            }
+
+            states: [
+                State {
+                    name: "shown"
+                    PropertyChanges {
+                        target: fileOpenContainer
+                        x: 20
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "x"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+        }
+
+        Rectangle {
+            id: splashScreen
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+            }
+            width: 300
+            height: 200
+            radius: 0.1 * height
+            color: "white"
+            opacity: 0.9
+            border { color: "black"; width: 2 }
+
+            Text {
+                anchors {
+                    fill: parent
+                    margins: 5
+                }
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                font.pixelSize: 24
+                text: "Tap on left side to switch between sources.\n\nTap on right side to switch between effects."
+                wrapMode: Text.WordWrap
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: parent.state = "hidden"
+            }
+
+            states: [
+                State {
+                    name: "hidden"
+                    PropertyChanges {
+                        target: splashScreen
+                        opacity: 0.0
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "opacity"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+        }
+
+        HintedMouseArea {
+            id: fileOpenMouseArea
+            anchors {
+                left: parent.left;
+                top: parent.top;
+                bottom: parameterPanel.top;
+                topMargin: 75
+            }
+            width: 100
+            onClicked: {
+                fileOpenMouseArea.hintEnabled = false
+                effectSelectionPanelMouseArea.hintEnabled = false
+                splashScreen.state = "hidden"
+                fileOpenContainer.state = "shown"
+            }
+            enabled: (fileOpenContainer.state != "shown" && effectSelectionPanel.state != "shown")
+        }
+
+        HintedMouseArea {
+            id: effectSelectionPanelMouseArea
+            anchors {
+                right: parent.right;
+                top: parent.top;
+                bottom: parameterPanel.top;
+                topMargin: 75
+            }
+            width: 100
+            onClicked: {
+                fileOpenMouseArea.hintEnabled = false
+                effectSelectionPanelMouseArea.hintEnabled = false
+                splashScreen.state = "hidden"
+                effectSelectionPanel.state = "shown"
+            }
+            enabled: (fileOpenContainer.state != "shown" && effectSelectionPanel.state != "shown")
+        }
+
+        Image {
+            source: "qrc:/images/close.png"
+
+            anchors {
+                top: parent.top
+                right: parent.right
+                margins: 5
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: Qt.quit()
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        fileOpen.openImage.connect(openImage)
+        fileOpen.openVideo.connect(openVideo)
+        fileOpen.openCamera.connect(openCamera)
+        fileOpen.close.connect(close)
+    }
+
+    Loader {
+        id: fileBrowserLoader
+    }
+
+    // Called from main() once root properties have been set
+    function init() {
+        console.log("[qmlvideofx] main.init")
+        content.init()
+        performanceLoader.init()
+        if (fileName != "") {
+            fileOpenMouseArea.hintEnabled = false
+            effectSelectionPanelMouseArea.hintEnabled = false
+            splashScreen.state = "hidden"
+            d.openFileType = "video"
+            openFile(fileName)
+        }
+    }
+
+    function qmlFramePainted() {
+        if (performanceLoader.item)
+            performanceLoader.item.qmlFramePainted()
+    }
+
+    function updateParameters() {
+        if (content.effect.numParameters >= 1)
+            content.effect.param1Value = parameterPanel.param1Value
+        if (content.effect.numParameters >= 2)
+            content.effect.param2Value = parameterPanel.param2Value
+    }
+
+    function openImage() {
+        fileOpenContainer.state = "baseState"
+        d.openFileType = "image"
+        showFileBrowser("../../images")
+    }
+
+    function openVideo() {
+        fileOpenContainer.state = "baseState"
+        d.openFileType = "video"
+        showFileBrowser("../../videos")
+    }
+
+    function openCamera() {
+        fileOpenContainer.state = "baseState"
+        content.openCamera()
+    }
+
+    function close() {
+        fileOpenContainer.state = "baseState"
+        content.openImage("qrc:/images/qt-logo.png")
+    }
+
+    function showFileBrowser(path) {
+        content.stop()
+        fileBrowserLoader.source = "FileBrowser.qml"
+        fileBrowserLoader.item.parent = root
+        fileBrowserLoader.item.anchors.fill = root
+        fileBrowserLoader.item.openFile.connect(root.openFile)
+        fileBrowserLoader.item.folder = path
+        inner.visible = false
+    }
+
+    function openFile(path) {
+        fileBrowserLoader.source = ""
+        if (path != "") {
+            if (d.openFileType == "image")
+                content.openImage(path)
+            else if (d.openFileType == "video")
+                content.openVideo(path)
+        }
+        inner.visible = true
+    }
+}
diff --git a/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
new file mode 100644
index 0000000000..8ba6e8864d
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -0,0 +1,200 @@
+// checksum 0x78c version 0x60010
+/*
+  This file was generated by the Qt Quick Application wizard of Qt Creator.
+  QmlApplicationViewer is a convenience class containing mobile device specific
+  code such as screen orientation handling. Also QML paths and debugging are
+  handled here.
+  It is recommended not to modify this file, since newer versions of Qt Creator
+  may offer an updated version of it.
+*/
+
+#include "qmlapplicationviewer.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtGui/QApplication>
+
+#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
+
+#ifdef HARMATTAN_BOOSTER
+#include <MDeclarativeCache>
+#endif
+
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+
+#include <qt_private/qdeclarativedebughelper_p.h>
+
+#if !defined(NO_JSDEBUGGER)
+#include <jsdebuggeragent.h>
+#endif
+#if !defined(NO_QMLOBSERVER)
+#include <qdeclarativeviewobserver.h>
+#endif
+
+// Enable debugging before any QDeclarativeEngine is created
+struct QmlJsDebuggingEnabler
+{
+    QmlJsDebuggingEnabler()
+    {
+        QDeclarativeDebugHelper::enableDebugging();
+    }
+};
+
+// Execute code in constructor before first QDeclarativeEngine is instantiated
+static QmlJsDebuggingEnabler enableDebuggingHelper;
+
+#endif // QMLJSDEBUGGER
+
+class QmlApplicationViewerPrivate
+{
+    QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
+
+    QString mainQmlFile;
+    QDeclarativeView *view;
+    friend class QmlApplicationViewer;
+    QString adjustPath(const QString &path);
+};
+
+QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
+{
+#ifdef Q_OS_UNIX
+#ifdef Q_OS_MAC
+    if (!QDir::isAbsolutePath(path))
+        return QCoreApplication::applicationDirPath()
+                + QLatin1String("/../Resources/") + path;
+#else
+    QString pathInInstallDir;
+    const QString applicationDirPath = QCoreApplication::applicationDirPath();
+    pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
+
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
+#endif
+#endif
+    return path;
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(this))
+{
+    connect(engine(), SIGNAL(quit()), SLOT(close()));
+    setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView *view, QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(view))
+{
+    connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
+    view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::~QmlApplicationViewer()
+{
+    delete d;
+}
+
+QmlApplicationViewer *QmlApplicationViewer::create()
+{
+#ifdef HARMATTAN_BOOSTER
+    return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
+#else
+    return new QmlApplicationViewer();
+#endif
+}
+
+void QmlApplicationViewer::setMainQmlFile(const QString &file)
+{
+    d->mainQmlFile = d->adjustPath(file);
+    d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));
+}
+
+void QmlApplicationViewer::addImportPath(const QString &path)
+{
+    d->view->engine()->addImportPath(d->adjustPath(path));
+}
+
+void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
+{
+#if defined(Q_OS_SYMBIAN)
+    // If the version of Qt on the device is < 4.7.2, that attribute won't work
+    if (orientation != ScreenOrientationAuto) {
+        const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
+        if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
+            qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
+            return;
+        }
+    }
+#endif // Q_OS_SYMBIAN
+
+    Qt::WidgetAttribute attribute;
+    switch (orientation) {
+#if QT_VERSION < 0x040702
+    // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
+    case ScreenOrientationLockPortrait:
+        attribute = static_cast<Qt::WidgetAttribute>(128);
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = static_cast<Qt::WidgetAttribute>(129);
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = static_cast<Qt::WidgetAttribute>(130);
+        break;
+#else // QT_VERSION < 0x040702
+    case ScreenOrientationLockPortrait:
+        attribute = Qt::WA_LockPortraitOrientation;
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = Qt::WA_LockLandscapeOrientation;
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = Qt::WA_AutoOrientation;
+        break;
+#endif // QT_VERSION < 0x040702
+    };
+    setAttribute(attribute, true);
+}
+
+void QmlApplicationViewer::showExpanded()
+{
+#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
+    d->view->showFullScreen();
+#elif defined(Q_WS_MAEMO_5)
+    d->view->showMaximized();
+#else
+    d->view->show();
+#endif
+}
+
+QApplication *createApplication(int &argc, char **argv)
+{
+#ifdef HARMATTAN_BOOSTER
+    return MDeclarativeCache::qApplication(argc, argv);
+#else
+    return new QApplication(argc, argv);
+#endif
+}
diff --git a/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
new file mode 100644
index 0000000000..f8008f5c4a
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
@@ -0,0 +1,47 @@
+// checksum 0x82ed version 0x60010
+/*
+  This file was generated by the Qt Quick Application wizard of Qt Creator.
+  QmlApplicationViewer is a convenience class containing mobile device specific
+  code such as screen orientation handling. Also QML paths and debugging are
+  handled here.
+  It is recommended not to modify this file, since newer versions of Qt Creator
+  may offer an updated version of it.
+*/
+
+#ifndef QMLAPPLICATIONVIEWER_H
+#define QMLAPPLICATIONVIEWER_H
+
+#include <QtDeclarative/QDeclarativeView>
+
+class QmlApplicationViewer : public QDeclarativeView
+{
+    Q_OBJECT
+
+public:
+    enum ScreenOrientation {
+        ScreenOrientationLockPortrait,
+        ScreenOrientationLockLandscape,
+        ScreenOrientationAuto
+    };
+
+    explicit QmlApplicationViewer(QWidget *parent = 0);
+    virtual ~QmlApplicationViewer();
+
+    static QmlApplicationViewer *create();
+
+    void setMainQmlFile(const QString &file);
+    void addImportPath(const QString &path);
+
+    // Note that this will only have an effect on Symbian and Fremantle.
+    void setOrientation(ScreenOrientation orientation);
+
+    void showExpanded();
+
+private:
+    explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
+    class QmlApplicationViewerPrivate *d;
+};
+
+QApplication *createApplication(int &argc, char **argv);
+
+#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
new file mode 100644
index 0000000000..24aa9b466a
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -0,0 +1,141 @@
+# Based on file auto-generated by Qt Creator (version 0x60010)
+# Modified to install into the correct destination folder
+
+include(../../../../features/basic_examples_setup.pri)
+target.path = $${QT_MOBILITY_DEMOS}/$${TARGET}
+INSTALLS += target
+
+QT += declarative
+
+SOURCES += $$PWD/qmlapplicationviewer.cpp
+HEADERS += $$PWD/qmlapplicationviewer.h
+INCLUDEPATH += $$PWD
+
+# Include JS debugger library if QMLJSDEBUGGER_PATH is set
+!isEmpty(QMLJSDEBUGGER_PATH) {
+    include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
+} else {
+    DEFINES -= QMLJSDEBUGGER
+}
+
+contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
+    DEFINES += HARMATTAN_BOOSTER
+}
+
+# The code below handles deployment to Symbian and Maemo, aswell as copying
+# of the application data to shadow build directories on desktop.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+    item = item$${deploymentfolder}
+    itemsources = $${item}.sources
+    $$itemsources = $$eval($${deploymentfolder}.source)
+    itempath = $${item}.path
+    $$itempath= $$eval($${deploymentfolder}.target)
+    export($$itemsources)
+    export($$itempath)
+    DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$PWD
+
+symbian {
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+} else:win32 {
+    copyCommand =
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+        source = $$replace(source, /, \\)
+        sourcePathSegments = $$split(source, \\)
+        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
+        target = $$replace(target, /, \\)
+        !isEqual(source,$$target) {
+            !isEmpty(copyCommand):copyCommand += &&
+            isEqual(QMAKE_DIR_SEP, \\) {
+                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            } else {
+                source = $$replace(source, \\\\, /)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                target = $$replace(target, \\\\, /)
+                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+            }
+        }
+    }
+    !isEmpty(copyCommand) {
+        copyCommand = @echo Copying application data... && $$copyCommand
+        copydeploymentfolders.commands = $$copyCommand
+        first.depends = $(first) copydeploymentfolders
+        export(first.depends)
+        export(copydeploymentfolders.commands)
+        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+    }
+} else:unix {
+    maemo5 {
+        desktopfile.files = $${TARGET}.desktop
+        desktopfile.path = /usr/share/applications/hildon
+        icon.files = $${TARGET}64.png
+        icon.path = /usr/share/icons/hicolor/64x64/apps
+    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        desktopfile.files = $${TARGET}_harmattan.desktop
+        desktopfile.path = /usr/share/applications
+        icon.files = $${TARGET}80.png
+        icon.path = /usr/share/icons/hicolor/80x80/apps
+    } else { # Assumed to be a Desktop Unix
+        copyCommand =
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+            source = $$replace(source, \\\\, /)
+            macx {
+                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+            } else {
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+            }
+            target = $$replace(target, \\\\, /)
+            sourcePathSegments = $$split(source, /)
+            targetFullPath = $$target/$$last(sourcePathSegments)
+            !isEqual(source,$$targetFullPath) {
+                !isEmpty(copyCommand):copyCommand += &&
+                copyCommand += $(MKDIR) \"$$target\"
+                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
+            }
+        }
+        !isEmpty(copyCommand) {
+            copyCommand = @echo Copying application data... && $$copyCommand
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            export(first.depends)
+            export(copydeploymentfolders.commands)
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
+    installPrefix = $${QT_MOBILITY_DEMOS}/$${TARGET}
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+
+    !isEmpty(desktopfile.path) {
+        export(icon.files)
+        export(icon.path)
+        export(desktopfile.files)
+        export(desktopfile.path)
+        INSTALLS += icon desktopfile
+    }
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
+
diff --git a/demos/video/qmlvideofx/qmlvideofx.png b/demos/video/qmlvideofx/qmlvideofx.png
new file mode 100644
index 0000000000..707d5c4e85
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.png
diff --git a/demos/video/qmlvideofx/qmlvideofx.pro b/demos/video/qmlvideofx/qmlvideofx.pro
new file mode 100644
index 0000000000..6f512943c8
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.pro
@@ -0,0 +1,42 @@
+TEMPLATE = app
+TARGET = qmlvideofx
+QT += opengl
+
+SOURCES += main.cpp
+HEADERS += trace.h
+RESOURCES += qmlvideofx.qrc
+
+qml_folder.source = qml/qmlvideofx
+qml_folder.target = qml
+DEPLOYMENTFOLDERS += qml_folder
+
+images_folder.source = images
+images_folder.target = .
+DEPLOYMENTFOLDERS += images_folder
+
+SNIPPETS_PATH = ../snippets
+include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
+performanceItemAddDeployment()
+
+symbian|contains(MEEGO_EDITION,harmattan): {
+    DEFINES += SMALL_SCREEN_LAYOUT
+    DEFINES += SMALL_SCREEN_PHYSICAL
+}
+
+symbian {
+    DEFINES += USE_OPENGL_GRAPHICSSYSTEM
+    TARGET.CAPABILITY += UserEnvironment
+}
+
+include(qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
diff --git a/demos/video/qmlvideofx/qmlvideofx.qrc b/demos/video/qmlvideofx/qmlvideofx.qrc
new file mode 100644
index 0000000000..6ca4ef54bf
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/images">
+        <file alias="close.png">images/close.png</file>
+        <file alias="folder.png">images/folder.png</file>
+        <file alias="titlebar.png">images/titlebar.png</file>
+        <file alias="titlebar.sci">images/titlebar.sci</file>
+        <file alias="up.png">images/up.png</file>
+        <file alias="qt-logo.png">images/qt-logo.png</file>
+    </qresource>
+</RCC>
diff --git a/demos/video/qmlvideofx/qmlvideofx.svg b/demos/video/qmlvideofx/qmlvideofx.svg
new file mode 100644
index 0000000000..566acfada0
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="44px"
+   version="1.1"
+   viewBox="0 0 44 44"
+   width="44px"
+   x="0px"
+   y="0px"
+   id="svg2"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="qt.svg">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 22 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="44 : 22 : 1"
+       inkscape:persp3d-origin="22 : 14.666667 : 1"
+       id="perspective2836" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="21.454545"
+     inkscape:cx="49.412871"
+     inkscape:cy="21.894358"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3" />
+  <g
+     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
+     id="g3">
+    <path
+       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
+       style="fill:#006225"
+       id="path5"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
+       style="fill:#80c342"
+       id="path7" />
+    <path
+       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
+       style="fill:#006225"
+       id="path11" />
+    <path
+       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
+       style="fill:#006225"
+       id="path13" />
+    <path
+       id="path17"
+       style="fill:#ffffff"
+       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
+    <path
+       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
+       style="fill:#006225"
+       id="path19" />
+    <path
+       id="path21"
+       style="fill:#006225"
+       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
+  </g>
+</svg>
diff --git a/demos/video/qmlvideofx/qmlvideofx_harmattan.desktop b/demos/video/qmlvideofx/qmlvideofx_harmattan.desktop
new file mode 100644
index 0000000000..12e33c9b9e
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx_harmattan.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=qmlvideofx
+Exec=/opt/qmlvideofx/bin/qmlvideofx
+Icon=
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/README b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/README
new file mode 100644
index 0000000000..f9b68e1350
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/README
@@ -0,0 +1,6 @@
+The Debian Package qmlvideofx
+----------------------------
+
+Comments regarding the Package
+
+ -- unknown <>  Wed, 19 Oct 2011 14:56:46 +0100
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/changelog b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/changelog
new file mode 100644
index 0000000000..a88b72d187
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/changelog
@@ -0,0 +1,5 @@
+qmlvideofx (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- unknown <>  Wed, 19 Oct 2011 14:56:46 +0100
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/compat b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/compat
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/compat
@@ -0,0 +1 @@
+7
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/control b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/control
new file mode 100644
index 0000000000..ca365e0908
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/control
@@ -0,0 +1,14 @@
+Source: qmlvideofx
+Section: user/other
+Priority: optional
+Maintainer: unknown <>
+Build-Depends: debhelper (>= 5), libqt4-dev
+Standards-Version: 3.7.3
+Homepage: <insert the upstream URL, if relevant>
+
+Package: qmlvideofx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+XSBC-Maemo-Display-Name: qmlvideofx
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/copyright b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/copyright
new file mode 100644
index 0000000000..1d6654ae54
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/copyright
@@ -0,0 +1,40 @@
+This package was debianized by unknown <> on
+Wed, 19 Oct 2011 14:56:46 +0100.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2011, unknown <> and
+is licensed under the GPL, see above.
+
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/manifest.aegis b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/manifest.aegis
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/manifest.aegis
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/rules b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/rules
new file mode 100644
index 0000000000..baa61bc466
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+
+configure-stamp:
+	dh_testdir
+	# qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp
+	dh_testdir
+
+	# Add here commands to compile the package.
+	# $(MAKE) # Uncomment this line for use without Qt Creator
+	#docbook-to-man debian/qmlvideofx.sgml > qmlvideofx.1
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/qmlvideofx.
+	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/qmlvideofx install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	# dh_shlibdeps # Uncomment this line for use without Qt Creator
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
diff --git a/demos/video/qmlvideofx/trace.h b/demos/video/qmlvideofx/trace.h
new file mode 100644
index 0000000000..cc49e98e44
--- /dev/null
+++ b/demos/video/qmlvideofx/trace.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TRACE_H
+#define TRACE_H
+
+#include <QtCore/QDebug>
+
+#define ENABLE_TRACE
+//#define VERBOSE_TRACE
+
+namespace Trace {
+
+class NullDebug
+{
+public:
+    template <typename T>
+    NullDebug& operator<<(const T&) { return *this; }
+};
+
+inline NullDebug nullDebug() { return NullDebug(); }
+
+template <typename T>
+struct PtrWrapper
+{
+    PtrWrapper(const T *ptr) : m_ptr(ptr) { }
+    const T *const m_ptr;
+};
+
+} // namespace Trace
+
+template <typename T>
+inline QDebug& operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
+{
+    debug.nospace() << "[" << (void*)wrapper.m_ptr << "]";
+    return debug.space();
+}
+
+template<typename T>
+inline const void *qtVoidPtr(const T *ptr)
+{ return static_cast<const void *>(ptr); }
+
+#define qtThisPtr() qtVoidPtr(this)
+
+#ifdef ENABLE_TRACE
+        inline QDebug qtTrace() { return qDebug() << "[qmlvideofx]"; }
+#    ifdef VERBOSE_TRACE
+        inline QDebug qtVerboseTrace() { return qtTrace(); }
+#    else
+        inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#    endif
+#else
+    inline Trace::NullDebug qtTrace() { return Trace::nullDebug(); }
+    inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#endif
+
+#endif // TRACE_H
+
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitor.cpp b/demos/video/snippets/frequencymonitor/frequencymonitor.cpp
new file mode 100644
index 0000000000..c154b139c6
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitor.cpp
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "frequencymonitor.h"
+#include <QtCore/QDebug>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QString>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
+
+//#define VERBOSE_TRACE
+
+inline QDebug qtTrace() { return qDebug() << "[frequencymonitor]"; }
+#ifdef VERBOSE_TRACE
+inline QDebug qtVerboseTrace() { return qtTrace(); }
+#else
+inline QNoDebug qtVerboseTrace() { return QNoDebug(); }
+#endif
+
+static const int DefaultSamplingInterval = 100;
+static const int DefaultTraceInterval = 0;
+
+class FrequencyMonitorPrivate : public QObject
+{
+    Q_OBJECT
+public:
+    FrequencyMonitorPrivate(FrequencyMonitor *parent);
+    void calculateInstantaneousFrequency();
+
+private slots:
+    void calculateAverageFrequency();
+    void stalled();
+
+public:
+    FrequencyMonitor *const q_ptr;
+    QString m_label;
+    bool m_active;
+    qreal m_instantaneousFrequency;
+    QElapsedTimer m_instantaneousElapsed;
+    QTimer *m_averageTimer;
+    QElapsedTimer m_averageElapsed;
+    int m_count;
+    qreal m_averageFrequency;
+    QTimer *m_traceTimer;
+    QTimer *m_stalledTimer;
+};
+
+FrequencyMonitorPrivate::FrequencyMonitorPrivate(FrequencyMonitor *parent)
+:   QObject(parent)
+,   q_ptr(parent)
+,   m_active(false)
+,   m_instantaneousFrequency(0)
+,   m_averageTimer(new QTimer(this))
+,   m_count(0)
+,   m_averageFrequency(0)
+,   m_traceTimer(new QTimer(this))
+,   m_stalledTimer(new QTimer(this))
+{
+    m_instantaneousElapsed.start();
+    connect(m_averageTimer, SIGNAL(timeout()),
+            this, SLOT(calculateAverageFrequency()));
+    if (DefaultSamplingInterval)
+        m_averageTimer->start(DefaultSamplingInterval);
+    m_averageElapsed.start();
+    connect(m_traceTimer, SIGNAL(timeout()),
+            q_ptr, SLOT(trace()));
+    if (DefaultTraceInterval)
+        m_traceTimer->start(DefaultTraceInterval);
+    m_stalledTimer->setSingleShot(true);
+    connect(m_stalledTimer, SIGNAL(timeout()),
+            this, SLOT(stalled()));
+}
+
+void FrequencyMonitorPrivate::calculateInstantaneousFrequency()
+{
+    const qint64 ms = m_instantaneousElapsed.restart();
+    m_instantaneousFrequency = ms ? qreal(1000) / ms : 0;
+    m_stalledTimer->start(3 * ms);
+    if (m_instantaneousFrequency)
+        q_ptr->setActive(true);
+    q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
+    q_ptr->emit frequencyChanged();
+}
+
+void FrequencyMonitorPrivate::calculateAverageFrequency()
+{
+    const qint64 ms = m_averageElapsed.restart();
+    m_averageFrequency = qreal(m_count * 1000) / ms;
+    q_ptr->emit averageFrequencyChanged(m_averageFrequency);
+    q_ptr->emit frequencyChanged();
+    m_count = 0;
+}
+
+void FrequencyMonitorPrivate::stalled()
+{
+    if (m_instantaneousFrequency) {
+        qtVerboseTrace() << "FrequencyMonitor::stalled";
+        m_instantaneousFrequency = 0;
+        q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
+        q_ptr->emit frequencyChanged();
+    }
+}
+
+FrequencyMonitor::FrequencyMonitor(QObject *parent)
+:   QObject(parent)
+,   d_ptr(0)
+{
+    d_ptr = new FrequencyMonitorPrivate(this);
+    qtTrace() << "FrequencyMonitor::FrequencyMonitor";
+}
+
+FrequencyMonitor::~FrequencyMonitor()
+{
+
+}
+
+const QString &FrequencyMonitor::label() const
+{
+    return d_func()->m_label;
+}
+
+bool FrequencyMonitor::active() const
+{
+    return d_func()->m_active;
+}
+
+int FrequencyMonitor::samplingInterval() const
+{
+    return d_ptr->m_averageTimer->isActive() ? d_ptr->m_averageTimer->interval() : 0;
+}
+
+int FrequencyMonitor::traceInterval() const
+{
+    return d_ptr->m_traceTimer->isActive() ? d_ptr->m_traceTimer->interval() : 0;
+}
+
+qreal FrequencyMonitor::instantaneousFrequency() const
+{
+    return d_func()->m_instantaneousFrequency;
+}
+
+qreal FrequencyMonitor::averageFrequency() const
+{
+    return d_func()->m_averageFrequency;
+}
+
+void FrequencyMonitor::notify()
+{
+    Q_D(FrequencyMonitor);
+    ++(d->m_count);
+    d->calculateInstantaneousFrequency();
+}
+
+void FrequencyMonitor::trace()
+{
+    Q_D(FrequencyMonitor);
+    const QString value = QString::fromAscii("instant %1 average %2")
+                            .arg(d->m_instantaneousFrequency, 0, 'f', 2)
+                            .arg(d->m_averageFrequency, 0, 'f', 2);
+    if (d->m_label.isEmpty())
+        qtTrace() << "FrequencyMonitor::trace" << value;
+    else
+        qtTrace() << "FrequencyMonitor::trace" << "label" << d->m_label << value;
+}
+
+void FrequencyMonitor::setLabel(const QString &value)
+{
+    Q_D(FrequencyMonitor);
+    if (d->m_label != value) {
+        d->m_label = value;
+        emit labelChanged(d->m_label);
+    }
+}
+
+void FrequencyMonitor::setActive(bool value)
+{
+    Q_D(FrequencyMonitor);
+    if (d->m_active != value) {
+        d->m_active = value;
+        emit activeChanged(d->m_active);
+    }
+}
+
+void FrequencyMonitor::setSamplingInterval(int value)
+{
+    Q_D(FrequencyMonitor);
+    if (samplingInterval() != value) {
+        if (value) {
+            d->m_averageTimer->setInterval(value);
+            d->m_averageTimer->start();
+        } else {
+            d->m_averageTimer->stop();
+        }
+        emit samplingIntervalChanged(value);
+    }
+}
+
+void FrequencyMonitor::setTraceInterval(int value)
+{
+    Q_D(FrequencyMonitor);
+    if (traceInterval() != value) {
+        if (value) {
+            d->m_traceTimer->setInterval(value);
+            d->m_traceTimer->start();
+        } else {
+            d->m_traceTimer->stop();
+        }
+        emit traceIntervalChanged(value);
+    }
+}
+
+#include "frequencymonitor.moc"
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitor.h b/demos/video/snippets/frequencymonitor/frequencymonitor.h
new file mode 100644
index 0000000000..c85b9fa9d6
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitor.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef FREQUENCYMONITOR_H
+#define FREQUENCYMONITOR_H
+
+#include <QtCore/QObject>
+
+class QTimer;
+
+class FrequencyMonitorPrivate;
+
+/**
+ * Class for measuring frequency of events
+ *
+ * Occurrence of the event is notified by the client via the notify() slot.
+ * On a regular interval, both an instantaneous and a rolling average
+ * event frequency are calculated.
+ */
+class FrequencyMonitor : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(FrequencyMonitor)
+    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(int samplingInterval READ samplingInterval WRITE setSamplingInterval NOTIFY samplingIntervalChanged)
+    Q_PROPERTY(int traceInterval READ traceInterval WRITE setTraceInterval NOTIFY traceIntervalChanged)
+    Q_PROPERTY(qreal instantaneousFrequency READ instantaneousFrequency NOTIFY instantaneousFrequencyChanged)
+    Q_PROPERTY(qreal averageFrequency READ averageFrequency NOTIFY averageFrequencyChanged)
+public:
+    FrequencyMonitor(QObject *parent = 0);
+    ~FrequencyMonitor();
+
+    static void qmlRegisterType();
+
+    const QString &label() const;
+    bool active() const;
+    int samplingInterval() const;
+    int traceInterval() const;
+    qreal instantaneousFrequency() const;
+    qreal averageFrequency() const;
+
+signals:
+    void labelChanged(const QString &value);
+    void activeChanged(bool);
+    void samplingIntervalChanged(int value);
+    void traceIntervalChanged(int value);
+    void frequencyChanged();
+    void instantaneousFrequencyChanged(qreal value);
+    void averageFrequencyChanged(qreal value);
+
+public slots:
+    Q_INVOKABLE void notify();
+    Q_INVOKABLE void trace();
+    void setActive(bool value);
+    void setLabel(const QString &value);
+    void setSamplingInterval(int value);
+    void setTraceInterval(int value);
+
+private:
+    FrequencyMonitorPrivate *d_ptr;
+};
+
+#endif // FREQUENCYMONITOR_H
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitor.pri b/demos/video/snippets/frequencymonitor/frequencymonitor.pri
new file mode 100644
index 0000000000..f9dcb3414a
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitor.pri
@@ -0,0 +1,6 @@
+HEADERS += $$PWD/frequencymonitor.h
+SOURCES += $$PWD/frequencymonitor.cpp
+INCLUDEPATH += $$PWD
+DEFINES += FREQUENCYMONITOR_SUPPORT
+message("frequencymonitor.pri loaded")
+
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
new file mode 100644
index 0000000000..e310ec8c75
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "frequencymonitor.h"
+#include <QtDeclarative/qdeclarative.h>
+
+void FrequencyMonitor::qmlRegisterType()
+{
+    ::qmlRegisterType<FrequencyMonitor>("FrequencyMonitor", 1, 0, "FrequencyMonitor");
+}
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
new file mode 100644
index 0000000000..a6868385f2
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
@@ -0,0 +1,17 @@
+include($$PWD/frequencymonitor.pri)
+QT += declarative
+SOURCES += $$PWD/frequencymonitordeclarative.cpp
+
+defineTest(frequencyItemAddDeployment) {
+    symbian: frequencyitem_folder.source = $$PWD/$$SNIPPETS_PATH/frequencymonitor/qml/frequencymonitor
+    else: frequencyitem_folder.source = $$SNIPPETS_PATH/frequencymonitor/qml/frequencymonitor
+    frequencyitem_folder.target = qml
+    DEPLOYMENTFOLDERS += frequencyitem_folder
+
+    export(frequencyitem_folder.source)
+    export(frequencyitem_folder.target)
+    export(DEPLOYMENTFOLDERS)
+}
+
+message("frequencymonitordeclarative.pri loaded")
+
diff --git a/demos/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml b/demos/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
new file mode 100644
index 0000000000..ec2da36fb5
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import FrequencyMonitor 1.0
+
+Rectangle {
+    id: root
+    property bool logging: true
+    property bool displayed: true
+    property bool enabled: logging || displayed
+    property alias active: monitor.active
+    property int samplingInterval: 500
+    property color textColor: "yellow"
+    property int textSize: 20
+    property alias label: monitor.label
+
+    border.width: 1
+    border.color: "yellow"
+    width: 3.5 * root.textSize
+    height: 3.0 * root.textSize
+    color: "black"
+    opacity: 0.5
+    radius: 10
+    visible: displayed && active
+
+    // This should ensure that the monitor is on top of all other content
+    z: 999
+
+    function notify() {
+        monitor.notify()
+    }
+
+    FrequencyMonitor {
+        id: monitor
+        samplingInterval: root.enabled ? root.samplingInterval : 0
+        onAverageFrequencyChanged: {
+            if (root.logging) trace()
+            instantaneousFrequencyText.text = monitor.instantaneousFrequency.toFixed(2)
+            averageFrequencyText.text = monitor.averageFrequency.toFixed(2)
+        }
+    }
+
+    Text {
+        id: instantaneousFrequencyText
+        anchors {
+            right: parent.right
+            top: parent.top
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+    }
+
+    Text {
+        id: averageFrequencyText
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+    }
+}
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.cpp b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.cpp
new file mode 100644
index 0000000000..5e6cc573a9
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.cpp
@@ -0,0 +1,386 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphicsmemorymonitor.h"
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEngine>
+#include <QtGui/QWidget>
+
+#ifdef Q_OS_SYMBIAN
+#ifdef GRAPHICSMEMORYMONITOR_EGL
+#define EGL_RESOURCE_PROFILING_SUPPORT
+#endif
+#endif
+
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+#include <EGL/egl.h>
+typedef EGLBoolean (*PFNEGLQUERYPROFILINGDATANOK)(EGLDisplay, EGLint, EGLint *, EGLint, EGLint *);
+#endif
+
+//#define VERBOSE_TRACE
+
+inline QDebug qtTrace() { return qDebug() << "[graphicsmemorymonitor]"; }
+#ifdef VERBOSE_TRACE
+inline QDebug qtVerboseTrace() { return qtTrace(); }
+#else
+inline QNoDebug qtVerboseTrace() { return QNoDebug(); }
+#endif
+
+static const qint64 DefaultUpdateInterval = 1000;
+
+// Helper function
+QString humanReadableSize(qint64 size)
+{
+    static const qint64 KB = 1024;
+    static const qint64 MB = KB * KB;
+    static const qint64 GB = MB * KB;
+    static const qint64 TB = GB * KB;
+    QString suffix = "B";
+    qint64 factor = 1;
+    qreal n = size;
+    if (size > TB) {
+        suffix = "TB";
+        factor = TB;
+    } else if (size > GB) {
+        suffix = "GB";
+        factor = GB;
+    } else if (size > MB) {
+        suffix = "MB";
+        factor = MB;
+    } else if (size > KB) {
+        suffix = "KB";
+        factor = KB;
+    }
+    n = n / qreal(factor);
+    return QString("%1 %2").arg(n, 6, 'f', 2).arg(suffix);
+}
+
+class GraphicsMemoryMonitorPrivate : public QObject
+{
+    Q_OBJECT
+public:
+    GraphicsMemoryMonitorPrivate(GraphicsMemoryMonitor *parent);
+    ~GraphicsMemoryMonitorPrivate();
+
+private:
+    void ensureEglExtension();
+
+public slots:
+    void update();
+
+public:
+    GraphicsMemoryMonitor *const q_ptr;
+    QTimer *m_timer;
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    EGLDisplay m_eglDisplay;
+    PFNEGLQUERYPROFILINGDATANOK m_eglQueryProfilingDataNOK;
+#endif
+#ifdef Q_OS_SYMBIAN
+    TFullName m_processName;
+#endif
+    QByteArray m_buffer;
+    qint64 m_currentProcessId;
+    qint64 m_totalMemory;
+    qint64 m_usedMemory;
+    qint64 m_currentProcessUsage;
+    QList<GraphicsMemoryMonitor::ProcessInfo> m_processList;
+};
+
+GraphicsMemoryMonitorPrivate::GraphicsMemoryMonitorPrivate(GraphicsMemoryMonitor *parent)
+:   QObject(parent)
+,   q_ptr(parent)
+,   m_timer(new QTimer(this))
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+,   m_eglDisplay(EGL_NO_DISPLAY)
+,   m_eglQueryProfilingDataNOK(0)
+#endif
+,   m_currentProcessId(0)
+,   m_totalMemory(0)
+,   m_usedMemory(0)
+,   m_currentProcessUsage(0)
+{
+    connect(m_timer, SIGNAL(timeout()),
+            this, SLOT(update()));
+    m_timer->setInterval(DefaultUpdateInterval);
+    m_timer->start();
+#ifdef Q_OS_SYMBIAN
+    m_currentProcessId = RProcess().Id().operator unsigned int();
+#endif
+}
+
+GraphicsMemoryMonitorPrivate::~GraphicsMemoryMonitorPrivate()
+{
+
+}
+
+void GraphicsMemoryMonitorPrivate::ensureEglExtension()
+{
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    if (!m_eglQueryProfilingDataNOK) {
+        m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+        qtTrace() << "GraphicsMemoryMonitorPrivate::ensureEglExtension" << "eglDisplay" << m_eglDisplay;
+        if (m_eglDisplay == EGL_NO_DISPLAY)
+            qtTrace() << "No EGL display";
+        else
+            m_eglQueryProfilingDataNOK = reinterpret_cast<PFNEGLQUERYPROFILINGDATANOK>(eglGetProcAddress("eglQueryProfilingDataNOK"));
+        if (m_eglQueryProfilingDataNOK)
+            q_ptr->emit activeChanged();
+        else
+            qtTrace() << "eglQueryProfilingDataNOK extension not found";
+    }
+#endif
+}
+
+void GraphicsMemoryMonitorPrivate::update()
+{
+    qint64 totalMemory = 0;
+    qint64 usedMemory = 0;
+    qint64 currentProcessUsage = 0;
+    QList<GraphicsMemoryMonitor::ProcessInfo> processList;
+
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    ensureEglExtension();
+    if (m_eglQueryProfilingDataNOK) {
+        // Ensure we have an EGL connection, in case we are using raster graphics
+        eglInitialize(m_eglDisplay, 0, 0);
+
+        GraphicsMemoryMonitor::ProcessInfo process;
+        process.pid = 0;
+        EGLint count = 0;
+        m_eglQueryProfilingDataNOK(m_eglDisplay, EGL_PROF_QUERY_MEMORY_USAGE_BIT_NOK | EGL_PROF_QUERY_GLOBAL_BIT_NOK, NULL, 0, &count);
+        m_buffer.resize(count * sizeof(EGLint));
+        m_buffer.fill(0);
+        EGLint *data = reinterpret_cast<EGLint *>(m_buffer.data());
+        m_eglQueryProfilingDataNOK(m_eglDisplay, EGL_PROF_QUERY_MEMORY_USAGE_BIT_NOK | EGL_PROF_QUERY_GLOBAL_BIT_NOK, data, count, &count);
+        for (int i=0; i<count; ++i) {
+            switch (data[i]) {
+            case EGL_PROF_TOTAL_MEMORY_NOK:
+                totalMemory = data[++i];
+                break;
+            case EGL_PROF_USED_MEMORY_NOK:
+                usedMemory = data[++i];
+                break;
+            case EGL_PROF_PROCESS_ID_NOK:
+            {
+                if (process.pid)
+                    processList << process;
+                process.pid = quint64(data[i+1]) + (quint64(data[i+2]) << 32);
+                process.name = QString();
+                i += 2;
+                RProcess p;
+                const TInt err = p.Open(TProcessId(process.pid));
+                if (!err) {
+                    m_processName = p.FullName();
+                    TPtr8 name = m_processName.Collapse();
+                    process.name = QString(reinterpret_cast<const char *>(name.PtrZ()));
+                    p.Close();
+                }
+                process.privateUsage = 0;
+                process.sharedUsage = 0;
+            }
+                break;
+            case EGL_PROF_PROCESS_USED_PRIVATE_MEMORY_NOK:
+                process.privateUsage = data[++i];
+                break;
+            case EGL_PROF_PROCESS_USED_SHARED_MEMORY_NOK:
+                process.sharedUsage = data[++i];
+                break;
+            default:
+                qtTrace() << "unknown data" << "index" << i << "data" << reinterpret_cast<void *>(data[i]);
+                break;
+            }
+        }
+        if (process.pid)
+            processList << process;
+    }
+#endif // EGL_RESOURCE_PROFILING_SUPPORT
+
+    bool processListChanged = (m_processList.count() != processList.count());
+    if (!processListChanged) {
+        for (int i=0; !processListChanged && i<m_processList.count(); ++i) {
+            const GraphicsMemoryMonitor::ProcessInfo &oldProcess = m_processList.at(i);
+            const GraphicsMemoryMonitor::ProcessInfo &newProcess = processList.at(i);
+            processListChanged = (oldProcess.pid != newProcess.pid) ||
+                                 (oldProcess.privateUsage != newProcess.privateUsage) ||
+                                 (oldProcess.sharedUsage != newProcess.sharedUsage);
+        }
+    }
+
+    foreach (GraphicsMemoryMonitor::ProcessInfo process, m_processList)
+        if (m_currentProcessId == process.pid)
+            currentProcessUsage = process.privateUsage + process.sharedUsage;
+
+    bool availableMemoryChanged = false;
+    if (totalMemory != m_totalMemory) {
+        m_totalMemory = totalMemory;
+        availableMemoryChanged = true;
+        q_ptr->emit totalMemoryChanged(q_ptr->totalMemory());
+        q_ptr->emit totalMemoryHumanReadableChanged(q_ptr->totalMemoryHumanReadable());
+    }
+    if (usedMemory != m_usedMemory) {
+        m_usedMemory = usedMemory;
+        availableMemoryChanged = true;
+        q_ptr->emit usedMemoryChanged(q_ptr->usedMemory());
+        q_ptr->emit usedMemoryHumanReadableChanged(q_ptr->usedMemoryHumanReadable());
+    }
+    bool hasChanged = availableMemoryChanged;
+    if (availableMemoryChanged) {
+        q_ptr->emit availableMemoryChanged(q_ptr->availableMemory());
+        q_ptr->emit availableMemoryHumanReadableChanged(q_ptr->availableMemoryHumanReadable());
+    }
+    if (currentProcessUsage != m_currentProcessUsage) {
+        m_currentProcessUsage = currentProcessUsage;
+        hasChanged = true;
+        q_ptr->emit currentProcessUsageChanged(q_ptr->currentProcessUsage());
+        q_ptr->emit currentProcessUsageHumanReadableChanged(q_ptr->currentProcessUsageHumanReadable());
+    }
+    if (processListChanged) {
+        m_processList = processList;
+        hasChanged = true;
+        q_ptr->emit processListChanged(m_processList);
+    }
+    if (hasChanged)
+        q_ptr->emit changed();
+}
+
+GraphicsMemoryMonitor::GraphicsMemoryMonitor(QObject *parent)
+:   QObject(parent)
+,   d_ptr(0)
+{
+    qtTrace() << "GraphicsMemoryMonitor::GraphicsMemoryMonitor";
+    d_ptr = new GraphicsMemoryMonitorPrivate(this);
+    d_ptr->update();
+}
+
+GraphicsMemoryMonitor::~GraphicsMemoryMonitor()
+{
+    qtTrace() << "GraphicsMemoryMonitor::~GraphicsMemoryMonitor";
+}
+
+bool GraphicsMemoryMonitor::active() const
+{
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    return (d_ptr->m_eglQueryProfilingDataNOK != 0);
+#else
+    return false;
+#endif
+}
+
+qint64 GraphicsMemoryMonitor::updateInterval() const
+{
+    return d_ptr->m_timer->isActive() ? d_ptr->m_timer->interval() : 0;
+}
+
+void GraphicsMemoryMonitor::setUpdateInterval(qint64 value)
+{
+    if (value != updateInterval()) {
+        if (value) {
+            d_ptr->m_timer->setInterval(value);
+            d_ptr->m_timer->start();
+        } else {
+            d_ptr->m_timer->stop();
+        }
+    }
+}
+
+qint64 GraphicsMemoryMonitor::totalMemory() const
+{
+    return d_ptr->m_totalMemory;
+}
+
+QString GraphicsMemoryMonitor::totalMemoryHumanReadable() const
+{
+    return humanReadableSize(totalMemory());
+}
+
+qint64 GraphicsMemoryMonitor::usedMemory() const
+{
+    return d_ptr->m_usedMemory;
+}
+
+QString GraphicsMemoryMonitor::usedMemoryHumanReadable() const
+{
+    return humanReadableSize(usedMemory());
+}
+
+qint64 GraphicsMemoryMonitor::availableMemory() const
+{
+    return totalMemory() - usedMemory();
+}
+
+QString GraphicsMemoryMonitor::availableMemoryHumanReadable() const
+{
+    return humanReadableSize(availableMemory());
+}
+
+qint64 GraphicsMemoryMonitor::currentProcessUsage() const
+{
+    return d_ptr->m_currentProcessUsage;
+}
+
+QString GraphicsMemoryMonitor::currentProcessUsageHumanReadable() const
+{
+    return humanReadableSize(currentProcessUsage());
+}
+
+const QList<GraphicsMemoryMonitor::ProcessInfo> &GraphicsMemoryMonitor::processList() const
+{
+    return d_ptr->m_processList;
+}
+
+void GraphicsMemoryMonitor::update()
+{
+    d_ptr->update();
+}
+
+void GraphicsMemoryMonitor::trace()
+{
+    qtTrace() << "GraphicsMemoryMonitor::trace";
+    qtTrace() << "    Total memory:         " << d_ptr->m_totalMemory;
+    qtTrace() << "    Used memory:          " << d_ptr->m_usedMemory;
+    qtTrace() << "    Available memory:     " << d_ptr->m_totalMemory - d_ptr->m_usedMemory;
+    qtTrace() << "    Current process ID:   " << d_ptr->m_currentProcessId;
+    qtTrace() << "    Current process usage:" << d_ptr->m_currentProcessUsage;
+    foreach (ProcessInfo process, d_ptr->m_processList) {
+        qtTrace() << "    Process ID" << process.pid << "name" << process.name;
+        qtTrace() << "        Private usage:" << process.privateUsage;
+        qtTrace() << "        Shared usage: " << process.sharedUsage;
+    }
+}
+
+#include "graphicsmemorymonitor.moc"
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h
new file mode 100644
index 0000000000..154685216d
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRAPHICSMEMORYMONITOR_H
+#define GRAPHICSMEMORYMONITOR_H
+
+#include <QtCore/QObject>
+#include <QtCore/QProcess>
+
+class GraphicsMemoryMonitorPrivate;
+
+class GraphicsMemoryMonitor : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(GraphicsMemoryMonitor)
+    Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+    Q_PROPERTY(qint64 totalMemory READ totalMemory NOTIFY totalMemoryChanged)
+    Q_PROPERTY(QString totalMemoryHumanReadable READ totalMemoryHumanReadable NOTIFY totalMemoryHumanReadableChanged)
+    Q_PROPERTY(qint64 usedMemory READ usedMemory NOTIFY usedMemoryChanged)
+    Q_PROPERTY(QString usedMemoryHumanReadable READ usedMemoryHumanReadable NOTIFY usedMemoryHumanReadableChanged)
+    Q_PROPERTY(qint64 availableMemory READ availableMemory NOTIFY availableMemoryChanged)
+    Q_PROPERTY(QString availableMemoryHumanReadable READ availableMemoryHumanReadable NOTIFY availableMemoryHumanReadableChanged)
+    Q_PROPERTY(qint64 currentProcessUsage READ currentProcessUsage NOTIFY currentProcessUsageChanged)
+    Q_PROPERTY(QString currentProcessUsageHumanReadable READ currentProcessUsageHumanReadable NOTIFY currentProcessUsageHumanReadableChanged)
+    Q_PROPERTY(qint64 updateInterval READ updateInterval WRITE setUpdateInterval NOTIFY updateIntervalChanged)
+public:
+    GraphicsMemoryMonitor(QObject *parent = 0);
+    ~GraphicsMemoryMonitor();
+
+    static void qmlRegisterType();
+
+    bool active() const;
+
+    qint64 updateInterval() const;
+    void setUpdateInterval(qint64 value);
+
+    qint64 totalMemory() const;
+    QString totalMemoryHumanReadable() const;
+
+    qint64 usedMemory() const;
+    QString usedMemoryHumanReadable() const;
+
+    qint64 availableMemory() const;
+    QString availableMemoryHumanReadable() const;
+
+    qint64 currentProcessUsage() const;
+    QString currentProcessUsageHumanReadable() const;
+
+    struct ProcessInfo
+    {
+        qint64 pid;
+        QString name;
+        qint64 privateUsage;
+        qint64 sharedUsage;
+    };
+
+    const QList<ProcessInfo> &processList() const;
+
+public slots:
+    Q_INVOKABLE void update();
+    void trace();
+
+signals:
+    void activeChanged();
+    void updateIntervalChanged();
+    void changed();
+    void totalMemoryChanged(qint64);
+    void totalMemoryHumanReadableChanged(QString);
+    void usedMemoryChanged(qint64);
+    void usedMemoryHumanReadableChanged(QString);
+    void availableMemoryChanged(qint64);
+    void availableMemoryHumanReadableChanged(QString);
+    void currentProcessUsageChanged(qint64);
+    void currentProcessUsageHumanReadableChanged(QString);
+    void processListChanged(const QList<GraphicsMemoryMonitor::ProcessInfo> &);
+
+private:
+    GraphicsMemoryMonitorPrivate *d_ptr;
+};
+
+#endif // GRAPHICSMEMORYMONITOR_H
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.pri b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.pri
new file mode 100644
index 0000000000..67bde6f20a
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.pri
@@ -0,0 +1,12 @@
+HEADERS += $$PWD/graphicsmemorymonitor.h
+SOURCES += $$PWD/graphicsmemorymonitor.cpp
+INCLUDEPATH += $$PWD
+DEFINES += GRAPHICSMEMORYMONITOR_SUPPORT
+symbian {
+    contains(QT_CONFIG, egl) {
+        DEFINES += GRAPHICSMEMORYMONITOR_EGL
+        LIBS += -llibegl
+    }
+}
+message("graphicsmemorymonitor.pri loaded")
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp
new file mode 100644
index 0000000000..9503da73db
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphicsmemorymonitor.h"
+#include <QtDeclarative/qdeclarative.h>
+
+void GraphicsMemoryMonitor::qmlRegisterType()
+{
+    ::qmlRegisterType<GraphicsMemoryMonitor>("GraphicsMemoryMonitor", 1, 0, "GraphicsMemoryMonitor");
+}
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri
new file mode 100644
index 0000000000..7d07436501
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri
@@ -0,0 +1,17 @@
+include($$PWD/graphicsmemorymonitor.pri)
+QT += declarative
+SOURCES += $$PWD/graphicsmemorymonitordeclarative.cpp
+
+defineTest(graphicsMemoryItemAddDeployment) {
+    symbian: graphicsmemoryitem_folder.source = $$PWD/$$SNIPPETS_PATH/graphicsmemorymonitor/qml/graphicsmemorymonitor
+    else: graphicsmemoryitem_folder.source = $$SNIPPETS_PATH/graphicsmemorymonitor/qml/graphicsmemorymonitor
+    graphicsmemoryitem_folder.target = qml
+    DEPLOYMENTFOLDERS += graphicsmemoryitem_folder
+
+    export(graphicsmemoryitem_folder.source)
+    export(graphicsmemoryitem_folder.target)
+    export(DEPLOYMENTFOLDERS)
+}
+
+message("graphicsmemorymonitordeclarative.pri loaded")
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml b/demos/video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml
new file mode 100644
index 0000000000..c1421f5b9a
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import GraphicsMemoryMonitor 1.0
+
+Rectangle {
+    id: root
+    property bool logging: true
+    property bool displayed: true
+    property bool enabled: logging || displayed
+    property int updateInterval: 500
+    property color textColor: "yellow"
+    property int textSize: 20
+
+    border.width: 1
+    border.color: "yellow"
+    width: 5.6 * root.textSize
+    height: 4.3 * root.textSize
+    color: "black"
+    opacity: 0.5
+    radius: 10
+    visible: displayed && monitor.active
+
+    // This should ensure that the monitor is on top of all other content
+    z: 999
+
+    GraphicsMemoryMonitor {
+        id: monitor
+        updateInterval: root.enabled ? root.updateInterval : 0
+        onChanged: if (root.logging) trace()
+    }
+
+    Text {
+        anchors {
+            right: parent.right
+            top: parent.top
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+        text: monitor.usedMemoryHumanReadable
+    }
+
+    Text {
+        anchors {
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+        text: monitor.currentProcessUsageHumanReadable
+    }
+
+    Text {
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+        text: monitor.totalMemoryHumanReadable
+    }
+}
+
diff --git a/demos/video/snippets/painteventmonitor/painteventmonitor.cpp b/demos/video/snippets/painteventmonitor/painteventmonitor.cpp
new file mode 100644
index 0000000000..c4d7b25624
--- /dev/null
+++ b/demos/video/snippets/painteventmonitor/painteventmonitor.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "painteventmonitor.h"
+#include <QtCore/QEvent>
+#include <QtGui/QWidget>
+
+PaintEventMonitor::PaintEventMonitor(QObject *parent)
+:   QObject(parent)
+,    m_target(0)
+{
+
+}
+
+PaintEventMonitor::~PaintEventMonitor()
+{
+
+}
+
+QWidget *PaintEventMonitor::target() const
+{
+    return m_target;
+}
+
+void PaintEventMonitor::setTarget(QWidget *value)
+{
+    if (m_target != value) {
+        if (m_target)
+            m_target->removeEventFilter(this);
+        m_target = value;
+        if (m_target)
+            m_target->installEventFilter(this);
+    }
+}
+
+bool PaintEventMonitor::eventFilter(QObject *object, QEvent *event)
+{
+    if (m_target == object && event->type() == QEvent::Paint)
+        emit targetPainted();
+    return QObject::eventFilter(object, event);
+}
+
diff --git a/demos/video/snippets/painteventmonitor/painteventmonitor.h b/demos/video/snippets/painteventmonitor/painteventmonitor.h
new file mode 100644
index 0000000000..ee0b4d80b5
--- /dev/null
+++ b/demos/video/snippets/painteventmonitor/painteventmonitor.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PAINTEVENTMONITOR_H
+#define PAINTEVENTMONITOR_H
+
+#include <QtCore/QObject>
+
+class QWidget;
+
+class PaintEventMonitor : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QWidget *target READ target WRITE setTarget NOTIFY targetChanged)
+public:
+    PaintEventMonitor(QObject *parent = 0);
+    ~PaintEventMonitor();
+
+    QWidget *target() const;
+    void setTarget(QWidget *value);
+
+protected:
+    bool eventFilter(QObject *object, QEvent *event);
+
+signals:
+    void targetChanged();
+    void targetPainted();
+
+private:
+    QWidget *m_target;
+};
+
+#endif // PAINTEVENTMONITOR_H
diff --git a/demos/video/snippets/painteventmonitor/painteventmonitor.pri b/demos/video/snippets/painteventmonitor/painteventmonitor.pri
new file mode 100644
index 0000000000..ec363c29f7
--- /dev/null
+++ b/demos/video/snippets/painteventmonitor/painteventmonitor.pri
@@ -0,0 +1,7 @@
+INCLUDEPATH += $$PWD
+HEADERS += $$PWD/painteventmonitor.h
+SOURCES += $$PWD/painteventmonitor.cpp
+DEFINES += PAINTEVENTMONITOR_SUPPORT
+
+message("painteventmonitordeclarative.pri loaded")
+
diff --git a/demos/video/snippets/performancemonitor/performancemonitor.cpp b/demos/video/snippets/performancemonitor/performancemonitor.cpp
new file mode 100644
index 0000000000..577d76d621
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitor.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "performancemonitor.h"
+#include <QtCore/QString>
+
+namespace PerformanceMonitor {
+
+    bool parseArgument(const QString &arg, State &state)
+    {
+        bool result = false;
+        if ("-log-perf" == arg) {
+            state.logging = true;
+            state.valid = true;
+            result = true;
+        } else if ("-no-log-perf" == arg) {
+            state.logging = false;
+            state.valid = true;
+            result = true;
+        } else if ("-show-perf" == arg) {
+            state.visible = true;
+            state.valid = true;
+            result = true;
+        } else if ("-hide-perf" == arg) {
+            state.visible = false;
+            state.valid = true;
+            result = true;
+        }
+        return result;
+    }
+
+}
diff --git a/demos/video/snippets/performancemonitor/performancemonitor.h b/demos/video/snippets/performancemonitor/performancemonitor.h
new file mode 100644
index 0000000000..c527390837
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitor.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PERFORMANCEMONITOR_H
+#define PERFORMANCEMONITOR_H
+
+class QString;
+
+namespace PerformanceMonitor {
+    struct State {
+        bool valid;
+        bool logging;
+        bool visible;
+
+        State() : valid(true), logging(false), visible(true) { }
+        State(bool l, bool v) : valid(true), logging(l), visible(v) { }
+        bool operator==(const State &other) const
+        { return logging == other.logging && visible == other.visible; }
+        bool operator!=(const State &other) const
+        { return logging != other.logging || visible != other.visible; }
+    };
+
+    bool parseArgument(const QString &arg, State &state);
+}
+
+#endif // PERFORMANCEMONITOR_H
+
diff --git a/demos/video/snippets/performancemonitor/performancemonitor.pri b/demos/video/snippets/performancemonitor/performancemonitor.pri
new file mode 100644
index 0000000000..6622488b5c
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitor.pri
@@ -0,0 +1,7 @@
+INCLUDEPATH += $$PWD
+HEADERS += $$PWD/performancemonitor.h
+SOURCES += $$PWD/performancemonitor.cpp
+DEFINES += PERFORMANCEMONITOR_SUPPORT
+
+message("performancemonitor.pri loaded")
+
diff --git a/demos/video/snippets/performancemonitor/performancemonitordeclarative.cpp b/demos/video/snippets/performancemonitor/performancemonitordeclarative.cpp
new file mode 100644
index 0000000000..5e4f853800
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitordeclarative.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "frequencymonitor.h"
+#include "graphicsmemorymonitor.h"
+#include "performancemonitor.h"
+
+namespace PerformanceMonitor {
+
+    void qmlRegisterTypes()
+    {
+        FrequencyMonitor::qmlRegisterType();
+        GraphicsMemoryMonitor::qmlRegisterType();
+    }
+}
diff --git a/demos/video/snippets/performancemonitor/performancemonitordeclarative.h b/demos/video/snippets/performancemonitor/performancemonitordeclarative.h
new file mode 100644
index 0000000000..95f82cff6e
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitordeclarative.h
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PERFORMANCEMONITORDECLARATIVE_H
+#define PERFORMANCEMONITORDECLARATIVE_H
+
+#include "performancemonitor.h"
+
+namespace PerformanceMonitor {
+    void qmlRegisterTypes();
+}
+
+#endif // PERFORMANCEMONITORDECLARATIVE_H
diff --git a/demos/video/snippets/performancemonitor/performancemonitordeclarative.pri b/demos/video/snippets/performancemonitor/performancemonitordeclarative.pri
new file mode 100644
index 0000000000..b7c0a5bd30
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitordeclarative.pri
@@ -0,0 +1,25 @@
+include($$PWD/../frequencymonitor/frequencymonitordeclarative.pri)
+include($$PWD/../graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri)
+include($$PWD/../painteventmonitor/painteventmonitor.pri)
+include($$PWD/performancemonitor.pri)
+
+HEADERS += $$PWD/performancemonitordeclarative.h
+SOURCES += $$PWD/performancemonitordeclarative.cpp
+
+PERFORMANCE_ROOT = $$PWD
+
+defineTest(performanceItemAddDeployment) {
+    frequencyItemAddDeployment()
+    graphicsMemoryItemAddDeployment()
+
+    symbian: performanceitem_folder.source = $$PWD/$$SNIPPETS_PATH/performancemonitor/qml/performancemonitor
+    else: performanceitem_folder.source = $$SNIPPETS_PATH/performancemonitor/qml/performancemonitor
+    performanceitem_folder.target = qml
+    DEPLOYMENTFOLDERS += performanceitem_folder
+
+    export(performanceitem_folder.source)
+    export(performanceitem_folder.target)
+    export(DEPLOYMENTFOLDERS)
+}
+
+message("performancemonitordeclarative.pri loaded")
diff --git a/demos/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml b/demos/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
new file mode 100644
index 0000000000..04bbb4389c
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    property bool logging: true
+    property bool displayed: true
+    property bool videoActive
+    property int samplingInterval: 500
+    property color textColor: "yellow"
+    property int textSize: 28
+    property int margins: 5
+
+    color: "transparent"
+
+    // This should ensure that the monitor is on top of all other content
+    z: 999
+
+    Loader {
+        id: videoFrameRateItemLoader
+        function init() {
+            source = "../frequencymonitor/FrequencyItem.qml"
+            item.label = "videoFrameRate"
+            item.parent = root
+            item.anchors.left = root.left
+            item.anchors.top = root.top
+            item.anchors.margins = root.margins
+            item.logging = root.logging
+            item.displayed = root.displayed
+            videoFrameRateActiveConnections.target = item
+        }
+
+        Connections {
+            id: videoFrameRateActiveConnections
+            ignoreUnknownSignals: true
+            onActiveChanged: root.videoActive = videoFrameRateActiveConnections.target.active
+        }
+    }
+
+    Loader {
+        id: qmlFrameRateItemLoader
+        function init() {
+            source = "../frequencymonitor/FrequencyItem.qml"
+            item.label = "qmlFrameRate"
+            item.parent = root
+            item.anchors.left = root.left
+            item.anchors.bottom = root.bottom
+            item.anchors.margins = root.margins
+            item.logging = root.logging
+            item.displayed = root.displayed
+        }
+    }
+
+    Loader {
+        id: graphicsMemoryItemLoader
+        function init() {
+            source = "../graphicsmemorymonitor/GraphicsMemoryItem.qml"
+            item.parent = root
+            item.anchors.right = root.right
+            item.anchors.bottom = root.bottom
+            item.anchors.margins = root.margins
+            item.logging = root.logging
+            item.displayed = root.displayed
+        }
+    }
+
+    function init() {
+        videoFrameRateItemLoader.init()
+        qmlFrameRateItemLoader.init()
+        graphicsMemoryItemLoader.init()
+    }
+
+    function videoFramePainted() {
+        videoFrameRateItemLoader.item.notify()
+    }
+
+    function qmlFramePainted() {
+        qmlFrameRateItemLoader.item.notify()
+    }
+
+    onVideoActiveChanged: {
+        videoFrameRateItemLoader.item.active = root.videoActive
+    }
+}
diff --git a/demos/video/video.pro b/demos/video/video.pro
new file mode 100644
index 0000000000..4f911b2b29
--- /dev/null
+++ b/demos/video/video.pro
@@ -0,0 +1,15 @@
+TEMPLATE = subdirs
+
+SUBDIRS += qmlvideo
+
+# qmlvideofx requires QtOpenGL and ShaderEffectItem (added in Qt 4.7.4)
+contains(QT_CONFIG, opengl) {
+    lessThan(QT_MAJOR_VERSION, 5) {
+        !lessThan(QT_MAJOR_VERSION, 4) {
+            SUBDIRS += qmlvideofx
+        }
+    } else {
+        SUBDIRS += qmlvideofx
+    }
+}
+
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index b2c4ec2703..34454c2ade 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -104,6 +104,8 @@
     \o \l{radio}{Radio}
     \o \l{slideshow}{Slideshow}
     \o \l{declarative-camera}{Declarative Camera}
+    \o \l{video/qmlvideo}{QML Video}
+    \o \l{video/qmlvideofx}{QML Video Shader Effects}
     \endlist
 
     \section2 Organizer
diff --git a/doc/src/examples/qmlvideo.qdoc b/doc/src/examples/qmlvideo.qdoc
new file mode 100644
index 0000000000..6356bb9023
--- /dev/null
+++ b/doc/src/examples/qmlvideo.qdoc
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example video/qmlvideo
+\title QML Video Example
+
+\brief The QML Video Example demonstrates the various manipulations (move;
+resize; rotate; change aspect ratio) which can be applied to QML \l{Video}
+and \l{Camera} items.
+
+\section1 Overview
+
+This example demonstrates the various manipulations (move; resize; rotate;
+change aspect ratio) which can be applied to QML \l{Video} and \l{Camera}
+items.
+
+It also shows how native code can be combined with QML to implement more
+advanced functionality - in this case, C++ code is used to calculate the QML
+frame rate and (on Symbian) the graphics memory consumption; these metrics
+are rendered in QML as semi-transparent items overlaid on the video content.
+
+The following image shows the application executing the video-overlay scene,
+which creates a dummy overlay item (just a semi-transparent \l{Rectangle}),
+which moves across the \l{Video} item.
+
+\image qmlvideo-overlay.png
+
+\section1 Application structure
+
+The \l{video/qmlvideo/qml/qmlvideo/main.qml} file creates a UI which includes
+the following elements:
+
+\list
+    \o Two \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button} elements, each
+       of which displays a filename, and can be used to launch a
+       \l{video/qmlvideo/qml/qmlvideo/FileBrowser.qml}{FileBrowser}
+    \o An exit \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button}
+    \o A \l{video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml}{SceneSelectionPanel},
+       which is a flickable list displaying the available scenes
+    \o At the lower left, an item which displays the QML repainting rate - the
+       upper number is the instantaneous frame rate and the lower number is the
+       average over the past second.
+    \o At the lower right (on Symbian only), an item which displays graphics
+       memory consumption information:total memory used; memory used by
+       current process; total memory.
+\endlist
+
+\image qmlvideo-menu.png
+
+Each scene in the flickable list is implemented in its own QML file - for
+example the video-basic scene (which just displays a static \l{Video} element
+in the center of the screen) is implemented in the
+\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic.qml} file.  As you
+can see from the code, this makes use of a type of inheritance: a
+\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic} element ...
+
+\quotefromfile video/qmlvideo/qml/qmlvideo/VideoBasic.qml
+\skipto import
+\printuntil /^\}/
+
+... is-a
+\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} ...
+
+\quotefromfile video/qmlvideo/qml/qmlvideo/SceneBasic.qml
+\skipto import
+\printuntil contentType
+\dots
+\skipto Content
+\printuntil content
+\dots
+\skipto }
+\printuntil /^\}/
+
+... which is-a
+\l{video/qmlvideo/qml/qmlvideo/Scene.qml}{Scene}:
+
+\quotefromfile video/qmlvideo/qml/qmlvideo/Scene.qml
+\skipto import
+\printuntil root
+\dots
+\skipto property QtObject content
+\printuntil content
+\dots
+\skipto Button
+\printuntil /^\}/
+
+\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} describes the
+structure and behaviour of the scene, but is agnostic of the type of content
+which will be displayed - this is abstracted by the
+\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content} element.
+
+This pattern allows us to define a particular use case (in this case, simply
+display a static piece of content), and then instantiate that use case for
+both video content
+(\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic}) and cameracontent
+(\l{video/qmlvideo/qml/qmlvideo/CameraBasic.qml}{CameraBasic}).  This approach
+is used to implement many of the other scenes - for example, "repeatedly slide
+the content from left to right and back again" is implemented by
+\l{video/qmlvideo/qml/qmlvideo/SceneMove.qml}{SceneMove}, on which
+\l{video/qmlvideo/qml/qmlvideo/VideoMove.qml}{VideoMove} and
+\l{video/qmlvideo/qml/qmlvideo/CameraMove.qml}{CameraMove} are based.
+
+Depending on the value of the contentType property in the top-level scene
+element, the embedded
+\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content} item creates either a
+\l{Video} or \l{Camera} item.
+
+\section1 Calculating and displaying QML painting rate
+
+\input examples/video-qml-paint-rate.qdocinc
+
+All that remains is to create a PaintEventMonitor in the C++ main() function, tell
+it to monitor the QML viewport widget, and to connect its framePainted() signal to
+a JavaScript function, which will eventually call frequencyItem.notify():
+
+\quotefromfile video/qmlvideo/main.cpp
+\skipto QmlApplicationViewer
+\printuntil ;
+\dots
+\skipto QGraphicsObject
+\printuntil ;
+\dots
+\skipto PaintEventMonitor
+\printuntil SLOT(qmlFramePainted()));
+
+\section1 Querying and displaying graphics memory consumption
+
+\input examples/video-graphics-memory.qdocinc
+
+*/
+
diff --git a/doc/src/examples/qmlvideofx.qdoc b/doc/src/examples/qmlvideofx.qdoc
new file mode 100644
index 0000000000..68a4e9df48
--- /dev/null
+++ b/doc/src/examples/qmlvideofx.qdoc
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example video/qmlvideofx
+\title QML Video Shader Effects Example
+
+\brief The QML Video Shader Effects Example shows how the \l {ShaderEffectItem}
+element can be used to apply postprocessing effects, expressed in GLSL, to QML
+\l {Video} and \l {Camera} items.
+
+\section1 Overview
+
+This example shows how the \l {ShaderEffectItem} element can be used to apply
+postprocessing effects, expressed in GLSL, to QML \l {Video} and \l {Camera} items.
+
+It also shows how native code can be combined with QML to implement more
+advanced functionality - in this case, C++ code is used to calculate the QML
+frame rate and (on Symbian) the graphics memory consumption; these metrics
+are rendered in QML as semi-transparent items overlaid on the video content.
+
+Finally, this application demonstrates the use of different top-level QML
+files to handle different physical screen sizes.  On small-screen devices,
+menus are by default hidden, and only appear when summoned by a gesture.
+Large-screen devices show a more traditional layout in which menus are
+displayed around the video content pane.
+
+The following screenshots show shader effects being applied.  In each case,
+the effect is implemented using a fragment shader.
+
+Here we see an edge detection algorithm being applied to a video clip
+(\l{http://orange.blender.org/}{Elephant's Dream from blender.org}).
+\image qmlvideofx-video-edgedetection.png
+
+This image shows a page curl effect, applied to the same video clip.
+\image qmlvideofx-video-pagecurl.png
+
+Here we see a 'glow' effect (edge detection plus colour quantization) being
+applied to the camera viewfinder.
+\image qmlvideofx-camera-glow.png
+
+This image shows a 'lens magnification' effect applied to the viewfinder.
+\image qmlvideofx-camera-magnify.png
+
+The application includes many more effects than the ones shown here - look
+for Effect*.qml files in the list above to see the full range.
+
+\section1 Application structure
+
+Shader effects can be applied to video or viewfinder content using the
+\l{ShaderEffectItem} element, as shown in the following example, which applies
+a wiggly effect to the content:
+
+\code
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    width: 300
+    height: 300
+    color: "black"
+
+    Video {
+        id: video
+        anchors.fill: parent
+        source: "test.mp4"
+    }
+
+    ShaderEffectItem {
+        property variant source: ShaderEffectSource { sourceItem: video; hideSource: true }
+        property real wiggleAmount: 0.005
+        anchors.fill: video
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform highp float wiggleAmount;
+            void main(void)
+            {
+                highp vec2 wiggledTexCoord = qt_TexCoord0;
+                wiggledTexCoord.s += sin(4.0 * 3.141592653589 * wiggledTexCoord.t) * wiggleAmount;
+                gl_FragColor = texture2D(source, wiggledTexCoord.st);
+            }
+        "
+    }
+}
+\endcode
+
+In this application, the usage of the \l{ShaderEffectItem}, \l{Video} and
+\l{Camera} elements is a bit more complicated, for the following reasons:
+
+\list
+    \o Each effect can be applied to either a \l{Video}, a \l{Camera} or a
+       \l{Image} item, so the type of the source item must be abstracted away
+       from the effect implementation
+    \o For some effects (such as the edge detection and glow examples shown in
+       the screenshots above), the transformation is applied only to pixels to
+       the left of a dividing line - this allows the effect to be easily
+       compared with the untransformed image on the right
+    \o Most effects have one or more parameters which can be modified by the
+       user - these are controlled by sliders in the UI which are connected
+       to uniform values passed into the GLSL code
+\endlist
+
+The abstraction of source item type is achieved by the
+\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} element, which uses a
+\l{Loader} to create either a \l{Video}, \l{Camera} or \l{Image} element:
+
+\quotefromfile video/qmlvideofx/qml/qmlvideofx/Content.qml
+\skipto import
+\printuntil {
+\dots
+\skipto Loader {
+\printuntil }
+\dots
+\skipto function openImage
+\printuntil "ContentImage.qml"
+\skipto contentLoader.item.source
+\printuntil path
+\skipto }
+\printuntil }
+\skipto function openVideo
+\printuntil "ContentVideo.qml"
+\skipto contentLoader.item.source
+\printuntil path
+\skipto }
+\printuntil }
+\skipto function openCamera
+\printuntil "ContentCamera.qml"
+\skipto }
+\printuntil }
+\skipto /^\}/
+\printuntil }
+
+Each effect is implemented as a QML item which is based on the
+\l{video/qmlvideofx/qml/qmlvideofx/Effect.qml}{Effect} element, which in turn
+is based on the \l{ShaderEffectItem} element:
+
+\quotefromfile video/qmlvideofx/qml/qmlvideofx/Effect.qml
+\skipto import
+\printuntil /^\}/
+
+The interface of the Effect element allows for derived effects to specify the
+number of parameters which they support (and therefore the number of sliders
+which should be displayed), and whether a vertical dividing line should be drawn
+between transformed and untransformed image regions.  As an example, here is the
+implementation of the pixelation effect.  As you can see, the pixelation effect
+supports one parameter (which controls the pixelation granularity), and states
+that the divider should be displayed.
+
+\quotefromfile video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
+\skipto import
+\printuntil /^\}/
+
+The main.qml file shows a
+\l{video/qmlvideofx/qml/qmlvideofx/FileOpen.qml}{FileOpen} element which allows
+the user to select the input source and an
+\l{video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml}{EffectSelectionPanel}
+item, which lists each of the available shader effects.  As described above, a
+\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} item is used to load the
+appropriate input and effect element.  A
+\l{video/qmlvideofx/qml/qmlvideofx/Divider.qml}{Divider} item draws the
+vertical dividing line, which can be dragged left / right by the user.  Finally,
+a \l{video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml}{ParameterPanel} item
+renders the sliders corresponding to each effect parameter.
+
+Here is the source selection menu:
+\image qmlvideofx-source-menu.png
+
+And here is the effect selection menu:
+\image qmlvideofx-effects-menu.png
+
+\section1 Calculating and displaying QML painting rate
+
+\input examples/video-qml-paint-rate.qdocinc
+
+All that remains is to create a PaintEventMonitor in the C++ main() function, tell
+it to monitor the QML viewport widget, and to connect its framePainted() signal to
+a JavaScript function, which will eventually call frequencyItem.notify():
+
+\quotefromfile video/qmlvideofx/main.cpp
+\skipto QmlApplicationViewer
+\printuntil ;
+\dots
+\skipto QGraphicsObject
+\printuntil ;
+\dots
+\skipto PaintEventMonitor
+\printuntil SLOT(qmlFramePainted()));
+
+\section1 Querying and displaying graphics memory consumption
+
+\input examples/video-graphics-memory.qdocinc
+
+*/
+
+
diff --git a/doc/src/examples/video-graphics-memory.qdocinc b/doc/src/examples/video-graphics-memory.qdocinc
new file mode 100644
index 0000000000..4d1ba8e519
--- /dev/null
+++ b/doc/src/examples/video-graphics-memory.qdocinc
@@ -0,0 +1,45 @@
+On Symbian, graphics memory consumption is an important consideration,
+because many of the current devices have a limited amount of graphics
+memory, which is shared by both the graphics stack (for OpenGLES /
+OpenVG rendering) and the camera/video stack.  For this reason, being
+able to track the amount of graphics memory being consumed by a given
+use case can be useful during application development.  This application
+demonstrates how this can be done, by using some native code to query
+graphics memory consumption information from a platform API, and a QML
+element to display this on screen in an overlay item.
+
+Starting with Symbian Anna, the platform implements an EGL extension
+called EGL_NOK_resource_profiling.  This allows the client to query
+
+\list
+    \o Total graphics memory
+    \o Total currently used graphics memory
+    \o Graphics memory used by calling process
+\endlist
+
+Being an EGL extension, this API isn't particularly friendly to use, so
+this example provides a simple Qt wrapper:
+
+\quotefromfile video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h
+\skipto class GraphicsMemoryMonitor : public QObject
+\printuntil updateIntervalChanged)
+\dots
+\skipto };
+\printline };
+
+This class is exposed to QML like this:
+
+\quotefromfile video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp
+\skipto GraphicsMemoryMonitor::qmlRegisterType
+\printuntil }
+
+And then the information is displayed by the GraphicsMemoryItem element:
+
+\quotefromfile video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml
+\skipto import
+\printuntil /^\}/
+
+The result looks like this:
+
+\image video-graphics-memory.png
+
diff --git a/doc/src/examples/video-qml-paint-rate.qdocinc b/doc/src/examples/video-qml-paint-rate.qdocinc
new file mode 100644
index 0000000000..2a645d7f23
--- /dev/null
+++ b/doc/src/examples/video-qml-paint-rate.qdocinc
@@ -0,0 +1,64 @@
+The QML painting rate is calculated by first creating a \l{QObject}-derived
+class called PaintEventMonitor, which allows its client to provide a
+\l{QWidget} to be monitored, and which emits a signal when that widget
+is repainted:
+
+\quotefromfile video/snippets/painteventmonitor/painteventmonitor.h
+\skipto class PaintEventMonitor
+\printuntil targetChanged)
+\dots
+\skipto protected
+\printuntil signals:
+\skipto void targetPainted
+\printuntil ;
+\skipto private
+\printuntil };
+
+The signal is generated by installing an event filter on the target \l{QWidget}:
+
+\quotefromfile video/snippets/painteventmonitor/painteventmonitor.cpp
+\skipto PaintEventMonitor::eventFilter
+\printuntil }
+
+A second class, FrequencyMonitor, is used to turn the stream of targetPainted()
+signals into an instantaneous and an averaged frequency:
+
+\quotefromfile video/snippets/frequencymonitor/frequencymonitor.h
+\skipto class FrequencyMonitor : public QObject
+\printuntil Q_OBJECT
+\skipto Q_PROPERTY(qreal instantaneousFrequency
+\printuntil averageFrequencyChanged)
+\skipto public
+\printuntil :
+\dots
+\skipto static void qmlRegisterType
+\printuntil ;
+\skipto public slots
+\printuntil notify();
+\skipto };
+\printline };
+
+The FrequencyMonitor class is exposed to QML like this
+
+\quotefromfile video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
+\skipto FrequencyMonitor::qmlRegisterType
+\printuntil }
+
+and its data is displayed by defining a QML item called FrequencyItem, like this:
+
+\quotefromfile video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
+\skipto import FrequencyMonitor
+\printuntil id: root
+\dots
+\skipto function notify
+\printuntil id: monitor
+\skipto onAverageFrequencyChanged
+\printuntil {
+\skipto instantaneousFrequencyText
+\printuntil /^\}/
+
+The result looks like this:
+
+\image video-qml-paint-rate.png
+
+
diff --git a/doc/src/images/qmlcamera-menu.png b/doc/src/images/qmlcamera-menu.png
new file mode 100644
index 0000000000..b2d7733195
--- /dev/null
+++ b/doc/src/images/qmlcamera-menu.png
diff --git a/doc/src/images/qmlvideo-menu.png b/doc/src/images/qmlvideo-menu.png
new file mode 100644
index 0000000000..b2d7733195
--- /dev/null
+++ b/doc/src/images/qmlvideo-menu.png
diff --git a/doc/src/images/qmlvideo-overlay.png b/doc/src/images/qmlvideo-overlay.png
new file mode 100644
index 0000000000..f5dc8390df
--- /dev/null
+++ b/doc/src/images/qmlvideo-overlay.png
diff --git a/doc/src/images/qmlvideofx-camera-glow.png b/doc/src/images/qmlvideofx-camera-glow.png
new file mode 100644
index 0000000000..aca874b6c9
--- /dev/null
+++ b/doc/src/images/qmlvideofx-camera-glow.png
diff --git a/doc/src/images/qmlvideofx-camera-magnify.png b/doc/src/images/qmlvideofx-camera-magnify.png
new file mode 100644
index 0000000000..c3156ce967
--- /dev/null
+++ b/doc/src/images/qmlvideofx-camera-magnify.png
diff --git a/doc/src/images/qmlvideofx-effects-menu.png b/doc/src/images/qmlvideofx-effects-menu.png
new file mode 100644
index 0000000000..507fd73843
--- /dev/null
+++ b/doc/src/images/qmlvideofx-effects-menu.png
diff --git a/doc/src/images/qmlvideofx-source-menu.png b/doc/src/images/qmlvideofx-source-menu.png
new file mode 100644
index 0000000000..661aaa73fa
--- /dev/null
+++ b/doc/src/images/qmlvideofx-source-menu.png
diff --git a/doc/src/images/qmlvideofx-video-edgedetection.png b/doc/src/images/qmlvideofx-video-edgedetection.png
new file mode 100644
index 0000000000..cedb314c52
--- /dev/null
+++ b/doc/src/images/qmlvideofx-video-edgedetection.png
diff --git a/doc/src/images/qmlvideofx-video-pagecurl.png b/doc/src/images/qmlvideofx-video-pagecurl.png
new file mode 100644
index 0000000000..5f5bdfb537
--- /dev/null
+++ b/doc/src/images/qmlvideofx-video-pagecurl.png
diff --git a/doc/src/images/video-graphics-memory.png b/doc/src/images/video-graphics-memory.png
new file mode 100644
index 0000000000..9479cce4c2
--- /dev/null
+++ b/doc/src/images/video-graphics-memory.png
diff --git a/doc/src/images/video-qml-paint-rate.png b/doc/src/images/video-qml-paint-rate.png
new file mode 100644
index 0000000000..1519ff64e4
--- /dev/null
+++ b/doc/src/images/video-qml-paint-rate.png
diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc
index 3ade6f2268..ec3746ebc4 100644
--- a/doc/src/multimedia.qdoc
+++ b/doc/src/multimedia.qdoc
@@ -332,6 +332,30 @@ write a camera application in C++.
 The \l {QML Camera Example} demonstrates still image capture and controls
 using the QML plugin. Video recording is not currently available.
 
+\section2 QML Video Example
+
+The \l {video/qmlvideo}{QML Video Example} demonstrates the various manipulations
+(move; resize; rotate; change aspect ratio) which can be applied to QML
+\l {Video} and \l {Camera} items.
+
+It also shows how native code can be combined with QML to implement more
+advanced functionality - in this case, C++ code is used to calculate the QML
+frame rate and (on Symbian) the graphics memory consumption; these metrics
+are rendered in QML as semi-transparent items overlaid on the video content.
+
+\section2 QML Video Shader Effects Example
+The \l {video/qmlvideofx}{QML Video Shader Effects Example} shows how the
+\l {ShaderEffectItem} element can be used to apply postprocessing effects,
+expressed in GLSL, to QML \l {Video} and \l {Camera} items.
+
+It re-uses the frame rate and memory consumption display code used by
+the \l {QML Video Example}.
+
+Finally, this application demonstrates the use of different top-level QML
+files to handle different physical screen sizes.  On small-screen devices,
+menus are by default hidden, and only appear when summoned by a gesture.
+Large-screen devices show a more traditional layout in which menus are
+displayed around the video content pane.
 
 \section1 Reference documentation