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

6
src/multimediawidgets/qpaintervideosurface_mac.mm
View File

@@ -134,6 +134,8 @@ QAbstractVideoSurface::Error QVideoSurfaceCoreGraphicsPainter::paint(
const QRectF &target, QPainter *painter, const QRectF &source)
{
if (m_frame.handleType() == QAbstractVideoBuffer::CoreImageHandle) {
//Non OpenGL CI rendering is disabled for now since qt_mac_cg_context is moved to platform plugin
#ifdef ENABLE_CORE_GRAPHICS_VIDEO_RENDERING
if (painter->paintEngine()->type() == QPaintEngine::CoreGraphics ) {
CIImage *img = (CIImage*)(m_frame.handle().value<void*>());
@@ -168,7 +170,9 @@ QAbstractVideoSurface::Error QVideoSurfaceCoreGraphicsPainter::paint(
return QAbstractVideoSurface::NoError;
}
}
} else if (painter->paintEngine()->type() == QPaintEngine::OpenGL2 ||
} else
#endif
if (painter->paintEngine()->type() == QPaintEngine::OpenGL2 ||
painter->paintEngine()->type() == QPaintEngine::OpenGL) {
CIImage *img = (CIImage*)(m_frame.handle().value<void*>());