From ba2daf7d948f740cd9ada2a26249ebbf76f5ca12 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Wed, 24 Mar 2010 10:57:56 +1000 Subject: 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 --- src/multimedia/video/qabstractvideobuffer.cpp | 2 ++ src/multimedia/video/qabstractvideobuffer.h | 2 ++ 2 files changed, 4 insertions(+) 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 }; -- cgit v0.12