From 09a7fda9711290ae00f74f5d762148c5b2f5f534 Mon Sep 17 00:00:00 2001
From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Date: Thu, 23 Aug 2012 15:59:18 +1000
Subject: 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>
---
 src/plugins/qt7/qt7movieviewrenderer.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/plugins/qt7/qt7movieviewrenderer.mm')

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);
-- 
cgit v1.2.3