diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-02-03 21:38:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 14:10:14 +0100 |
commit | f783c48a170c8ec86e4904b786a46dae5f07dfa7 (patch) | |
tree | 36933b75321164c3b0cb8bb8361299cdb4668a36 /src/multimedia/qtmultimediaquicktools_headers | |
parent | b28ee24628f77fced393cacc45500be6761e4497 (diff) |
VideoOutput: fix autoOrientation with a camera source.
Don't assume the camera frames are always in the same orientation as the
display in its primary orientation. We now take into account the camera
sensor position and orientation to calculate the viewport orientation.
Change-Id: Ib333c87f1804d1010ada42cb757e4fab78d75a04
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/multimedia/qtmultimediaquicktools_headers')
-rw-r--r-- | src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h index 2ca7c2933..cc939b230 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h @@ -47,6 +47,7 @@ #include <QtCore/qsharedpointer.h> #include <QtQuick/qquickitem.h> #include <QtCore/qpointer.h> +#include <QtMultimedia/qcamerainfo.h> #include <private/qtmultimediaquickdefs_p.h> @@ -138,6 +139,7 @@ private: QPointer<QObject> m_source; QPointer<QMediaObject> m_mediaObject; QPointer<QMediaService> m_service; + QCameraInfo m_cameraInfo; FillMode m_fillMode; QSize m_nativeSize; |