Changeset 53446 in vbox for trunk

Timestamp:

Dec 4, 2014 6:26:28 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Support for scaled video-output: Using fast-scaling mechanism and optimize corresponding code for further feature injection.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -814 +814 @@
 void UIFrameBuffer::paintDefault(QPaintEvent *pEvent)
 {
+    /* Prepare the 'paint' rectangle: */
+    QRect paintRect = pEvent->rect();
+
     /* Scaled image is NULL by default: */
     QImage scaledImage;
@@ -823 +826 @@
         scaledImage = m_image.copy();
         /* And scaling the image to predefined scaled-factor: */
-        scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, Qt::FastTransformation);
     }
     /* Finally we are choosing image to paint from: */
     const QImage &sourceImage = scaledImage.isNull() ? m_image : scaledImage;
 
-    /* Get rectangle to paint: */
-    QRect paintRect = pEvent->rect().intersected(sourceImage.rect()).intersected(m_pMachineView->viewport()->geometry());
+    /* Make sure paint-rectangle is within the image boundary: */
+    paintRect = paintRect.intersected(sourceImage.rect());
     if (paintRect.isEmpty())
         return;
@@ -844 +847 @@
 void UIFrameBuffer::paintSeamless(QPaintEvent *pEvent)
 {
+    /* Prepare the 'paint' rectangle: */
+    QRect paintRect = pEvent->rect();
+
     /* Scaled image is NULL by default: */
     QImage scaledImage;
@@ -853 +859 @@
         scaledImage = m_image.copy();
         /* And scaling the image to predefined scaled-factor: */
-        scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, Qt::FastTransformation);
     }
     /* Finally we are choosing image to paint from: */
     const QImage &sourceImage = scaledImage.isNull() ? m_image : scaledImage;
 
-    /* Get rectangle to paint: */
-    QRect paintRect = pEvent->rect().intersected(sourceImage.rect()).intersected(m_pMachineView->viewport()->geometry());
+    /* Make sure paint-rectangle is within the image boundary: */
+    paintRect = paintRect.intersected(sourceImage.rect());
     if (paintRect.isEmpty())
         return;
@@ -935 +941 @@
     if (dBackingScaleFactor > 1.0)
     {
-        /* Should we optimize HiDPI output for performance? */
+        /* Should we
+         * perform logical HiDPI scaling and optimize it for performance? */
         if (hiDPIOptimizationType == HiDPIOptimizationType_Performance)
         {
@@ -941 +948 @@
             subPixmap = subPixmap.scaled(subPixmap.size() * dBackingScaleFactor,
                                          Qt::IgnoreAspectRatio, Qt::FastTransformation);
+        }
+
 # ifdef Q_WS_MAC
 #  ifdef VBOX_GUI_WITH_HIDPI
+        /* Should we
+         * perform logical HiDPI scaling and optimize it for performance? */
+        if (hiDPIOptimizationType == HiDPIOptimizationType_Performance)
+        {
             /* Mark sub-pixmap as HiDPI: */
             subPixmap.setDevicePixelRatio(dBackingScaleFactor);
+        }
 #  endif /* VBOX_GUI_WITH_HIDPI */
 # endif /* Q_WS_MAC */
-        }
-    }
+    }
+
+    /* Which point we should draw corresponding sub-pixmap? */
+    QPoint paintPoint = rect.topLeft();
 
     /* Draw sub-pixmap: */
-    painter.drawPixmap(rect.x(), rect.y(), subPixmap);
+    painter.drawPixmap(paintPoint, subPixmap);
 #else /* QIMAGE_FRAMEBUFFER_WITH_DIRECT_OUTPUT */
     /* If HiDPI 'backing scale factor' defined: */