Changeset 51131 in vbox

Timestamp:

Apr 24, 2014 11:05:02 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: QImage frame-buffer: Optimizing paintEvent.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBufferQImage.cpp (modified) (3 diffs)
• UIFrameBufferQImage.h (modified) (1 diff)

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

@@ -208 +208 @@
     QPainter painter(m_pMachineView->viewport());
 
-    /* Draw image rectangle depending on rectangle width: */
-    if ((ulong)paintRect.width() < m_width * 2 / 3)
-        drawImageRectNarrow(painter, m_img,
-                            paintRect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
-    else
-        drawImageRectWide(painter, m_img,
-                          paintRect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
+    /* Draw image rectangle: */
+    drawImageRect(painter, m_img, paintRect,
+                  m_pMachineView->contentsX(), m_pMachineView->contentsY());
 }
 
@@ -259 +255 @@
 #endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS && Q_WS_WIN */
 
-            /* Draw image rectangle depending on rectangle width: */
-            if ((ulong)rect.width() < m_width * 2 / 3)
-                drawImageRectNarrow(painter, m_img,
-                                    rect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
-            else
-                drawImageRectWide(painter, m_img,
-                                  rect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
+            /* Draw image rectangle: */
+            drawImageRect(painter, m_img, rect,
+                          m_pMachineView->contentsX(), m_pMachineView->contentsY());
         }
     }
@@ -294 +286 @@
     QPainter painter(m_pMachineView->viewport());
 
-    /* Draw image rectangle depending on rectangle width: */
-    if ((ulong)paintRect.width() < m_width * 2 / 3)
-        drawImageRectNarrow(painter, sourceImage,
-                            paintRect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
-    else
-        drawImageRectWide(painter, sourceImage,
-                          paintRect, m_pMachineView->contentsX(), m_pMachineView->contentsY());
+    /* Draw image rectangle: */
+    drawImageRect(painter, sourceImage, paintRect,
+                  m_pMachineView->contentsX(), m_pMachineView->contentsY());
 }
 
 /* static */
-void UIFrameBufferQImage::drawImageRectNarrow(QPainter &painter, const QImage &image,
-                                              const QRect &rect, int iContentsShiftX, int iContentsShiftY)
-{
-    /* This method is faster for narrow updates: */
-    QPixmap pm = QPixmap::fromImage(image.copy(rect.x() + iContentsShiftX,
-                                               rect.y() + iContentsShiftY,
-                                               rect.width(), rect.height()));
-    painter.drawPixmap(rect.x(), rect.y(), pm);
-}
-
-/* static */
-void UIFrameBufferQImage::drawImageRectWide(QPainter &painter, const QImage &image,
-                                            const QRect &rect, int iContentsShiftX, int iContentsShiftY)
-{
-    /* This method is faster for wide updates: */
-    QPixmap pm = QPixmap::fromImage(QImage(image.scanLine(rect.y() + iContentsShiftY),
-                                           image.width(), rect.height(), image.bytesPerLine(),
-                                           QImage::Format_RGB32));
-    painter.drawPixmap(rect.x(), rect.y(), pm, rect.x() + iContentsShiftX, 0, 0, 0);
+void UIFrameBufferQImage::drawImageRect(QPainter &painter, const QImage &image, const QRect &rect,
+                                        int iContentsShiftX, int iContentsShiftY)
+{
+    /* Calculate offset: */
+    size_t offset = (rect.x() + iContentsShiftX) * image.depth() / 8 +
+                    (rect.y() + iContentsShiftY) * image.bytesPerLine();
+
+    /* Create sub-image (no copy involved): */
+    QImage subImage = QImage(image.bits() + offset,
+                             rect.width(), rect.height(),
+                             image.bytesPerLine(), image.format());
+
+#ifndef QIMAGE_FRAMEBUFFER_WITH_DIRECT_OUTPUT
+    /* Create sub-pixmap on the basis of sub-image above (1st copy involved): */
+    QPixmap subPixmap = QPixmap::fromImage(subImage);
+
+    /* Draw sub-pixmap: */
+    painter.drawPixmap(rect.x(), rect.y(), subPixmap);
+#else /* QIMAGE_FRAMEBUFFER_WITH_DIRECT_OUTPUT */
+    /* Directly draw sub-image (no copy involved): */
+    painter.drawImage(rect.x(), rect.y(), subImage);
+#endif /* QIMAGE_FRAMEBUFFER_WITH_DIRECT_OUTPUT */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.h

@@ -55 +55 @@
     void paintScale(QPaintEvent *pEvent);
 
-    /* Static helpers: Drawing stuff: */
-    static void drawImageRectNarrow(QPainter &painter, const QImage &image,
-                                    const QRect &rect, int iContentsShiftX, int iContentsShiftY);
-    static void drawImageRectWide(QPainter &painter, const QImage &image,
-                                  const QRect &rect, int iContentsShiftX, int iContentsShiftY);
+    /** Draws corresponding @a rect of passed @a image with @a painter. */
+    static void drawImageRect(QPainter &painter, const QImage &image, const QRect &rect,
+                              int iContentsShiftX, int iContentsShiftY);
 
     /* Helper: Fallback stuff: */