summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-07-16 04:06:03 (GMT)
committerDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-07-16 04:06:03 (GMT)
commit6771ce532f8b61499c998a502ea8c73e8e42262b (patch)
tree5dca2fa11da829a470b192cc0bf3b4375938ec1e /src/multimedia
parent6e2c3e7306883cd4618742e37861e326e9c91895 (diff)
downloadQt-6771ce532f8b61499c998a502ea8c73e8e42262b.zip
Qt-6771ce532f8b61499c998a502ea8c73e8e42262b.tar.gz
Qt-6771ce532f8b61499c998a502ea8c73e8e42262b.tar.bz2
Added a QPixmap based QAbstractVideoBuffer HandleType.
It can be used for example when the hw video decoder can use X11 pixmaps as a rendering target. Reviewed-by: Justin McPherson
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/video/qabstractvideobuffer.cpp1
-rw-r--r--src/multimedia/video/qabstractvideobuffer.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp
index e9d30d0..db05ee5 100644
--- a/src/multimedia/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/video/qabstractvideobuffer.cpp
@@ -73,6 +73,7 @@ QT_BEGIN_NAMESPACE
\value GLTextureHandle The handle of the buffer is an OpenGL texture ID.
\value XvShmImageHandle The handle contains pointer to shared memory XVideo image.
\value CoreImageHandle The handle contains pointer to Mac OS X CIImage.
+ \value QPixmapHandle The handle of the buffer is a QPixmap.
\value UserHandle Start value for user defined handle types.
\sa handleType()
diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h
index a8389db..98e12da 100644
--- a/src/multimedia/video/qabstractvideobuffer.h
+++ b/src/multimedia/video/qabstractvideobuffer.h
@@ -63,6 +63,7 @@ public:
GLTextureHandle,
XvShmImageHandle,
CoreImageHandle,
+ QPixmapHandle,
UserHandle = 1000
};