slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enabled CIImage based gfx video item on Mac

Browse Source 
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>
This commit is contained in:
Dmytro Poplavskiy
2012-08-23 15:59:18 +10:00
committed by Qt by Nokia
parent 3613a14b38
commit 09a7fda971
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
View File

@@ -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