summaryrefslogtreecommitdiffstats
path: root/src/multimedia/video/qvideoframe.h
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-01-12 16:11:47 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-13 07:54:19 +0100
commitc8f48841ef86d27b363ef3332158e8952165853d (patch)
tree2ba692fb45ac4e17dedcbaa5e7e61710b6fc07b9 /src/multimedia/video/qvideoframe.h
parent41ff2e68291181fc7d79abcb01c5edb2472ad5b0 (diff)
Add a metaData property to QVideoFrame.
Change-Id: I6614cd86e3e1e170277bfc751222b5b42cb657eb Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/multimedia/video/qvideoframe.h')
-rw-r--r--src/multimedia/video/qvideoframe.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index 5c3558721..f6261625e 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
@@ -46,6 +46,7 @@
#include <QtCore/qshareddata.h>
#include <QtGui/qimage.h>
#include <qabstractvideobuffer.h>
+#include <QtCore/qvariant.h>
QT_BEGIN_HEADER
@@ -54,7 +55,6 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QSize;
-class QVariant;
class QVideoFramePrivate;
@@ -156,6 +156,10 @@ public:
qint64 endTime() const;
void setEndTime(qint64 time);
+ QVariantMap availableMetaData() const;
+ QVariant metaData(const QString &key) const;
+ void setMetaData(const QString &key, const QVariant &value);
+
static PixelFormat pixelFormatFromImageFormat(QImage::Format format);
static QImage::Format imageFormatFromPixelFormat(PixelFormat format);