diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-01-30 14:32:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-30 14:32:29 +0100 |
| commit | 67b86a9fbd87fb50e896bf66313c2f949501df5b (patch) | |
| tree | 999c6c5c3b9f5c8961d17fd18cca35ff7db83edb /src/plugins/android/videonode/qandroidsgvideonode.h | |
| parent | 5980bc41cf55073e63236467466a59577d406937 (diff) | |
| parent | 9459acf48eaa9326e58bb1658408d045482a573b (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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 |