From patchwork Fri Jan 17 00:54:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2655 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9F7E86075C for ; Fri, 17 Jan 2020 01:54:38 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 23D6A9DA for ; Fri, 17 Jan 2020 01:54:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1579222478; bh=XXy1QdxQmvzRaCi5GdCGYGriofS1D+o7NCilHiJ9fG0=; h=From:To:Subject:Date:From; b=k/V45s2oGj59wzKpungWaNVUNI5UQ1wjev8P34aouoO5EghlK0JhDcLOsUaydT61t e1O5WlgAKZjvvxtWGSulYCEK2ZiPSazST5UTpG1F+iGZujWfBODOFR5QixXpfIUHj9 PDfZQ55U0xZ3DzLuxgmv5rVDsyDrnvSjYPPvbHUk= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 17 Jan 2020 02:54:20 +0200 Message-Id: <20200117005420.18210-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] qcam: Support scaling of the viewfinder X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2020 00:54:38 -0000 The viewfinder is drawn using a QLabel. This could support scaling through QLabel::setScaledContents(), but in a very inefficient way. To maintain reasonable efficiency, turn the viewfinder into a QWidget and draw the image directly using a QPainter. No performance change was noticed running on a fast x86 machine, and performance was 60% higher when scaling up to full screen compared to QLabel. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Kieran Bingham --- src/qcam/main_window.cpp | 1 - src/qcam/viewfinder.cpp | 22 +++++++++++++++------- src/qcam/viewfinder.h | 8 ++++++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 1d9c756f147a..df51fa888342 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -33,7 +33,6 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) viewfinder_ = new ViewFinder(this); setCentralWidget(viewfinder_); - viewfinder_->setFixedSize(500, 500); adjustSize(); ret = openCamera(cm); diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index 98a8ab68e5f6..6de284d1b782 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -6,13 +6,13 @@ */ #include -#include +#include #include "format_converter.h" #include "viewfinder.h" ViewFinder::ViewFinder(QWidget *parent) - : QLabel(parent), format_(0), width_(0), height_(0), image_(nullptr) + : QWidget(parent), format_(0), width_(0), height_(0), image_(nullptr) { } @@ -24,9 +24,7 @@ ViewFinder::~ViewFinder() void ViewFinder::display(const unsigned char *raw, size_t size) { converter_.convert(raw, size, image_); - - QPixmap pixmap = QPixmap::fromImage(*image_); - setPixmap(pixmap); + update(); } int ViewFinder::setFormat(unsigned int format, unsigned int width, @@ -42,10 +40,20 @@ int ViewFinder::setFormat(unsigned int format, unsigned int width, width_ = width; height_ = height; - setFixedSize(width, height); - delete image_; image_ = new QImage(width, height, QImage::Format_RGB32); + updateGeometry(); return 0; } + +void ViewFinder::paintEvent(QPaintEvent *) +{ + QPainter painter(this); + painter.drawImage(rect(), *image_, image_->rect()); +} + +QSize ViewFinder::sizeHint() const +{ + return image_ ? image_->size() : QSize(640, 480); +} diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index 33bdb1460f84..ef5fd45b264a 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -7,13 +7,13 @@ #ifndef __QCAM_VIEWFINDER_H__ #define __QCAM_VIEWFINDER_H__ -#include +#include #include "format_converter.h" class QImage; -class ViewFinder : public QLabel +class ViewFinder : public QWidget { public: ViewFinder(QWidget *parent); @@ -23,6 +23,10 @@ public: unsigned int height); void display(const unsigned char *rgb, size_t size); +protected: + void paintEvent(QPaintEvent *) override; + QSize sizeHint() const override; + private: unsigned int format_; unsigned int width_;