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 /src/plugins | |
| 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 'src/plugins')
| -rw-r--r-- | src/plugins/qt7/qt7movieviewrenderer.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qt7/qt7movieviewrenderer.mm b/src/plugins/qt7/qt7movieviewrenderer.mm index 3a6ff8a92..31bea7536 100644 --- a/src/plugins/qt7/qt7movieviewrenderer.mm +++ b/src/plugins/qt7/qt7movieviewrenderer.mm @@ -330,11 +330,11 @@ void QT7MovieViewRenderer::setupVideoOutput() QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle; QVideoFrame::PixelFormat pixelFormat = QVideoFrame::Format_RGB32; - if (glTextureSupported) { + if (coreImageFrameSupported) { + handleType = QAbstractVideoBuffer::CoreImageHandle; + } else if (glTextureSupported) { handleType = QAbstractVideoBuffer::GLTextureHandle; pixelFormat = QVideoFrame::Format_BGR32; - } else if (coreImageFrameSupported) { - handleType = QAbstractVideoBuffer::CoreImageHandle; } QVideoSurfaceFormat format(m_nativeSize, pixelFormat, handleType); |