Optimize widget redraw

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>

2 files changed, 29 insertions, 7 deletions

diff --git a/ftnoir_tracker_aruco/ar_video_widget.cpp b/ftnoir_tracker_aruco/ar_video_widget.cpp
index 6a4572a0..b727679b 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.cpp
+++ b/ftnoir_tracker_aruco/ar_video_widget.cpp
@@ -14,17 +14,31 @@ using namespace std;
 void ArucoVideoWidget::update_image(unsigned char *frame, int width, int height)
 {
     QMutexLocker foo(&mtx);
+    memcpy(fb, frame, width * height * 3);
+    this->width = width;
+    this->height = height;
+}
+
+void ArucoVideoWidget::update_and_repaint()
+{
+    QMutexLocker foo(&mtx);
+    if (width*height <= 0)
+        return;
     QImage qframe = QImage(width, height, QImage::Format_RGB888);
     uchar* data = qframe.bits();
     const int pitch = qframe.bytesPerLine();
     for (int y = 0; y < height; y++)
+    {
+        const int part = y*width;
         for (int x = 0; x < width; x++)
         {
-            const int pos = 3 * (y*width + x);
-            data[y * pitch + x * 3 + 0] = frame[pos + 2];
-            data[y * pitch + x * 3 + 1] = frame[pos + 1];
-            data[y * pitch + x * 3 + 2] = frame[pos + 0];
+            const int pos = 3 * (part + x);
+            data[y * pitch + x * 3 + 0] = fb[pos + 2];
+            data[y * pitch + x * 3 + 1] = fb[pos + 1];
+            data[y * pitch + x * 3 + 2] = fb[pos + 0];
         }
-    qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
-    pixmap = QPixmap::fromImage(qframe);
+    }
+    auto qframe2 = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
+    pixmap = QPixmap::fromImage(qframe2);
+    update();
 }
diff --git a/ftnoir_tracker_aruco/ar_video_widget.h b/ftnoir_tracker_aruco/ar_video_widget.h
index dd0c16ac..3a1574cd 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.h
+++ b/ftnoir_tracker_aruco/ar_video_widget.h
@@ -15,6 +15,7 @@
 #include <QLabel>
 #include <QPainter>
 #include <QPaintEvent>
+#include <QTimer>
 
 // ----------------------------------------------------------------------------
 class ArucoVideoWidget : public QWidget
@@ -22,7 +23,9 @@ class ArucoVideoWidget : public QWidget
 	Q_OBJECT
 
 public:
-    ArucoVideoWidget(QWidget *parent) : QWidget(parent), mtx() {
+    ArucoVideoWidget(QWidget *parent) : QWidget(parent), width(0), height(0), fb{0} {
+        connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint()));
+        timer.start(60);
 	}
     void update_image(unsigned char* frame, int width, int height);
 protected slots:
@@ -31,9 +34,14 @@ protected slots:
         QPainter painter(this);
         painter.drawPixmap(e->rect(), pixmap, e->rect());
     }
+    void update_and_repaint();
+
 private:
     QMutex mtx;
     QPixmap pixmap;
+    QTimer timer;
+    char fb[2048*2048*3];
+    int width,height;
 };
 
 #endif // VIDEOWIDGET_H