diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-24 00:57:56 (GMT) |
---|---|---|
committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-24 00:57:56 (GMT) |
commit | ba2daf7d948f740cd9ada2a26249ebbf76f5ca12 (patch) | |
tree | 8671e5a93177cc3120d2f6856a7f8073935d26c8 | |
parent | 0dff17f1e08f57040f3a156f9f3675024ec59978 (diff) | |
download | Qt-ba2daf7d948f740cd9ada2a26249ebbf76f5ca12.zip Qt-ba2daf7d948f740cd9ada2a26249ebbf76f5ca12.tar.gz Qt-ba2daf7d948f740cd9ada2a26249ebbf76f5ca12.tar.bz2 |
Added extra video buffer handle types.
XvShmImageHandle for XVideo shared memory image on X11 and
and CoreImageHandle for CIImage on Mac OS X.
Reviewed-by: Justin McPherson
-rw-r--r-- | src/multimedia/video/qabstractvideobuffer.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/video/qabstractvideobuffer.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index 465a1e7..e9d30d0 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -71,6 +71,8 @@ QT_BEGIN_NAMESPACE \value NoHandle The buffer has no handle, its data can only be accessed by mapping the buffer. \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 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 4ffa46f..a8389db 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -61,6 +61,8 @@ public: { NoHandle, GLTextureHandle, + XvShmImageHandle, + CoreImageHandle, UserHandle = 1000 }; |