Add autoOrientation property to QDeclarativeVideoOutput

The autoOrientation property is a flag to switch on/off automatic rotation of the video output, depending on the current screen orientation, to always show the output upright. This is useful when the VideoOutput is used as viewfinder for a Camera. Change-Id: I72753888592dc59c9adaa3343bfec8b168343229 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-26 12:00:43 +01:00
parent 954bb7b960
commit 18dbfc2538
7 changed files with 219 additions and 2 deletions
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -1,5 +1,5 @@
 TARGET = QtMultimedia
-QT = core-private network gui
+QT = core-private network gui-private

 QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf

--- a/src/multimedia/video/qvideooutputorientationhandler.cpp
+++ b/src/multimedia/video/qvideooutputorientationhandler.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Research In Motion
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qvideooutputorientationhandler_p.h"
+
+#include <QGuiApplication>
+#include <QScreen>
+#include <qpa/qplatformscreen.h>
+
+QT_BEGIN_NAMESPACE
+
+QVideoOutputOrientationHandler::QVideoOutputOrientationHandler(QObject *parent)
+    : QObject(parent)
+    , m_currentOrientation(0)
+{
+    QScreen *screen = QGuiApplication::primaryScreen();
+
+    // we want to be informed about all orientation changes
+    screen->setOrientationUpdateMask(Qt::PortraitOrientation|Qt::LandscapeOrientation
+                                     |Qt::InvertedPortraitOrientation|Qt::InvertedLandscapeOrientation);
+
+    connect(screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)),
+            this, SLOT(screenOrientationChanged(Qt::ScreenOrientation)));
+
+    screenOrientationChanged(screen->orientation());
+}
+
+int QVideoOutputOrientationHandler::currentOrientation() const
+{
+    return m_currentOrientation;
+}
+
+void QVideoOutputOrientationHandler::screenOrientationChanged(Qt::ScreenOrientation orientation)
+{
+    const QScreen *screen = QGuiApplication::primaryScreen();
+    const QPlatformScreen *platformScreen = screen->handle();
+
+    const int angle = (360 - screen->angleBetween(platformScreen->nativeOrientation(), orientation));
+
+    if (angle == m_currentOrientation)
+        return;
+
+    m_currentOrientation = angle;
+    emit orientationChanged(m_currentOrientation);
+}
+
+QT_END_NAMESPACE
--- a/src/multimedia/video/qvideooutputorientationhandler_p.h
+++ b/src/multimedia/video/qvideooutputorientationhandler_p.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Research In Motion
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QVIDEOOUTPUTORIENTATIONHANDLER_P_H
+#define QVIDEOOUTPUTORIENTATIONHANDLER_P_H
+
+#include <qtmultimediadefs.h>
+
+#include <QObject>
+
+QT_BEGIN_NAMESPACE
+
+class Q_MULTIMEDIA_EXPORT QVideoOutputOrientationHandler : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QVideoOutputOrientationHandler(QObject *parent = 0);
+
+    int currentOrientation() const;
+
+signals:
+    void orientationChanged(int angle);
+
+private slots:
+    void screenOrientationChanged(Qt::ScreenOrientation orientation);
+
+private:
+    int m_currentOrientation;
+};
+
+QT_END_NAMESPACE
+
+
+#endif
--- a/src/multimedia/video/video.pri
+++ b/src/multimedia/video/video.pri
@@ -12,6 +12,7 @@ PRIVATE_HEADERS += \
    video/qabstractvideobuffer_p.h \
    video/qimagevideobuffer_p.h \
    video/qmemoryvideobuffer_p.h \
+    video/qvideooutputorientationhandler_p.h \
    video/qvideosurfaceoutput_p.h

 SOURCES += \
@@ -20,6 +21,7 @@ SOURCES += \
    video/qimagevideobuffer.cpp \
    video/qmemoryvideobuffer.cpp \
    video/qvideoframe.cpp \
+    video/qvideooutputorientationhandler.cpp \
    video/qvideosurfaceformat.cpp \
    video/qvideosurfaceoutput.cpp \
    video/qvideoprobe.cpp