From 5ac18f1f5f758c28316791dc9aed8e216291dd38 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 4 Mar 2020 01:30:43 +0100
Subject: [PATCH] Speed up blurhash code

---
 src/BlurhashProvider.cpp          | 19 +++----------------
 src/ChatPage.cpp                  |  2 ++
 third_party/blurhash/blurhash.cpp |  5 ++++-
 third_party/blurhash/blurhash.hpp |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/BlurhashProvider.cpp b/src/BlurhashProvider.cpp
index a5530a98..87d1f51b 100644
--- a/src/BlurhashProvider.cpp
+++ b/src/BlurhashProvider.cpp
@@ -17,26 +17,13 @@ BlurhashProvider::requestImage(const QString &id, QSize *size, const QSize &requ
                 *size = sz;
 
         auto decoded = blurhash::decode(
-          QUrl::fromPercentEncoding(id.toUtf8()).toStdString(), sz.width(), sz.height());
+          QUrl::fromPercentEncoding(id.toUtf8()).toStdString(), sz.width(), sz.height(), 4);
         if (decoded.image.empty()) {
                 *size = QSize();
                 return QImage();
         }
 
-        QImage image(sz, QImage::Format_RGB888);
+        QImage image(decoded.image.data(), decoded.width, decoded.height, QImage::Format_RGB32);
 
-        for (int y = 0; y < sz.height(); y++) {
-                for (int x = 0; x < sz.width(); x++) {
-                        int base = (y * sz.width() + x) * 3;
-                        image.setPixel(x,
-                                       y,
-                                       qRgb(decoded.image[base],
-                                            decoded.image[base + 1],
-                                            decoded.image[base + 2]));
-                }
-        }
-
-        // std::copy(decoded.image.begin(), decoded.image.end(), image.bits());
-
-        return image;
+        return image.copy();
 }
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 6a7d984c..698a4ae2 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -332,6 +332,8 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
 
                           QImage img;
                           img.loadFromData(bin);
+                          if (img.height() > 200 && img.width() > 360)
+                                  img = img.scaled(360, 200, Qt::KeepAspectRatioByExpanding);
                           std::vector<unsigned char> data;
                           for (int y = 0; y < img.height(); y++) {
                                   for (int x = 0; x < img.width(); x++) {
diff --git a/third_party/blurhash/blurhash.cpp b/third_party/blurhash/blurhash.cpp
index 0ff6cb74..cd0a18a4 100644
--- a/third_party/blurhash/blurhash.cpp
+++ b/third_party/blurhash/blurhash.cpp
@@ -251,7 +251,7 @@ multiplyBasisFunction(Components components, int width, int height, unsigned cha
 
 namespace blurhash {
 Image
-decode(std::string_view blurhash, size_t width, size_t height)
+decode(std::string_view blurhash, size_t width, size_t height, size_t bytesPerPixel)
 {
         Image i{};
 
@@ -295,6 +295,9 @@ decode(std::string_view blurhash, size_t width, size_t height)
                         i.image.push_back(static_cast<unsigned char>(linearToSrgb(c.r)));
                         i.image.push_back(static_cast<unsigned char>(linearToSrgb(c.g)));
                         i.image.push_back(static_cast<unsigned char>(linearToSrgb(c.b)));
+
+                        for (size_t p = 3; p < bytesPerPixel; p++)
+                                i.image.push_back(255);
                 }
         }
 
diff --git a/third_party/blurhash/blurhash.hpp b/third_party/blurhash/blurhash.hpp
index 5077f0d5..e01b9b3f 100644
--- a/third_party/blurhash/blurhash.hpp
+++ b/third_party/blurhash/blurhash.hpp
@@ -13,7 +13,7 @@ struct Image
 
 // Decode a blurhash to an image with size width*height
 Image
-decode(std::string_view blurhash, size_t width, size_t height);
+decode(std::string_view blurhash, size_t width, size_t height, size_t bytesPerPixel = 3);
 
 // Encode an image of rgb pixels (without padding) with size width*height into a blurhash with x*y
 // components