diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-08-23 15:59:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-27 07:59:42 +0200 |
| commit | 09a7fda9711290ae00f74f5d762148c5b2f5f534 (patch) | |
| tree | ea68b7a06f7b0b9803865c87c506e3788abce70c /tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | |
| parent | 3613a14b3804d09d84a141b268f79857568b01b4 (diff) | |
Re-enabled CIImage based gfx video item on Mac
Also prefer CoreImageHandle to GLTextureHandle
in QuickTime player backend, to avoid unnecessary
copy via FBO.
Change-Id: Id5aa039c438378b7bbf816b7845b05574683c471
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp')
| -rw-r--r-- | tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index 096d0401d..8647133f2 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -792,7 +792,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat_data() << false #endif << false; -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC QTest::newRow((type.second + "YUV420P 640x480").constData()) << type.first << QAbstractVideoBuffer::NoHandle @@ -829,7 +829,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat_data() << QSize(-640, 480) << true << false; -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC QTest::newRow((type.second + "Texture: rgb565 32x32").constData()) << type.first << QAbstractVideoBuffer::GLTextureHandle @@ -852,7 +852,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat_data() << QSize(256, 256) << true << true; -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC QTest::newRow((type.second + "Texture: rgb24 1024x768").constData()) << type.first << QAbstractVideoBuffer::GLTextureHandle @@ -972,7 +972,7 @@ void tst_QPainterVideoSurface::shaderPresent_data() << static_cast<const uchar *>(rgb565ImageData) << int(sizeof(rgb565ImageData)) << 4; -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC QTest::newRow((type.second + "rgb32 -> yuv420p").constData()) << type.first << QVideoFrame::Format_RGB32 |