diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-27 18:54:20 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-27 18:54:20 +0100 |
commit | 9459acf48eaa9326e58bb1658408d045482a573b (patch) | |
tree | 395f0828e828c4bb9466262670c35f6e0ceff248 /src/plugins/android/videonode/qandroidsgvideonode.h | |
parent | 422099e8ddeddc0631db3a369e3c52f0ffe2f455 (diff) | |
parent | 7451906b71e7271238ecf9446b7960ab2c647cc9 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I83d589c55e8463cce23068dc81096aa66ec596a5
Diffstat (limited to 'src/plugins/android/videonode/qandroidsgvideonode.h')
-rw-r--r-- | src/plugins/android/videonode/qandroidsgvideonode.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/android/videonode/qandroidsgvideonode.h b/src/plugins/android/videonode/qandroidsgvideonode.h index b5b383fb6..5da72dd2d 100644 --- a/src/plugins/android/videonode/qandroidsgvideonode.h +++ b/src/plugins/android/videonode/qandroidsgvideonode.h @@ -43,6 +43,7 @@ #define QANDROIDSGVIDEONODE_H #include <private/qsgvideonode_p.h> +#include <qmutex.h> QT_BEGIN_NAMESPACE @@ -52,14 +53,18 @@ class QAndroidSGVideoNode : public QSGVideoNode { public: QAndroidSGVideoNode(const QVideoSurfaceFormat &format); + ~QAndroidSGVideoNode(); void setCurrentFrame(const QVideoFrame &frame); - QVideoFrame::PixelFormat pixelFormat() const; + QVideoFrame::PixelFormat pixelFormat() const { return m_format.pixelFormat(); } + + void preprocess(); private: - QVideoSurfaceFormat m_format; QAndroidSGVideoNodeMaterial *m_material; + QMutex m_frameMutex; QVideoFrame m_frame; + QVideoSurfaceFormat m_format; }; QT_END_NAMESPACE |