[{"id":4206,"web_url":"https://patchwork.libcamera.org/comment/4206/","msgid":"<3c03445d-053d-9c58-c6a8-bbed24a45fe8@ideasonboard.com>","date":"2020-03-23T14:44:08","subject":"Re: [libcamera-devel] [PATCH 03/21] qcam: Use QSize through the\n\tcode base","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 23/03/2020 14:21, Laurent Pinchart wrote:\n> Qt has a QSize class to store sizes. Use it to replace width and height\n> where applicable.\n> \n\nNice :-)\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/qcam/format_converter.cpp | 6 +++---\n> src/qcam/format_converter.h | 5 +++--\n> src/qcam/main_window.cpp | 4 ++--\n> src/qcam/viewfinder.cpp | 13 ++++++-------\n> src/qcam/viewfinder.h | 11 +++++------\n> 5 files changed, 19 insertions(+), 20 deletions(-)\n> \n> diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\n> index d8962a28c06c..bf887ad446eb 100644\n> --- a/src/qcam/format_converter.cpp\n> +++ b/src/qcam/format_converter.cpp\n> @@ -26,7 +26,7 @@\n> #endif\n> \n> int FormatConverter::configure(const libcamera::PixelFormat &format,\n> -\t\t\t unsigned int width, unsigned int height)\n> +\t\t\t const QSize &size)\n> {\n> \tswitch (format) {\n> \tcase DRM_FORMAT_NV12:\n> @@ -139,8 +139,8 @@ int FormatConverter::configure(const libcamera::PixelFormat &format,\n> \t};\n> \n> \tformat_ = format;\n> -\twidth_ = width;\n> -\theight_ = height;\n> +\twidth_ = size.width();\n> +\theight_ = size.height();\n> \n> \treturn 0;\n> }\n> diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h\n> index 96bde2384ddf..5e28adf0ef63 100644\n> --- a/src/qcam/format_converter.h\n> +++ b/src/qcam/format_converter.h\n> @@ -9,6 +9,8 @@\n> \n> #include \n> \n> +#include \n> +\n> #include \n> \n> class QImage;\n> @@ -16,8 +18,7 @@ class QImage;\n> class FormatConverter\n> {\n> public:\n> -\tint configure(const libcamera::PixelFormat &format, unsigned int width,\n> -\t\t unsigned int height);\n> +\tint configure(const libcamera::PixelFormat &format, const QSize &size);\n> \n> \tvoid convert(const unsigned char *src, size_t size, QImage *dst);\n> \n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 66aaf40c5d45..e0668176e427 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -232,8 +232,8 @@ int MainWindow::startCapture()\n> \t}\n> \n> \tStream *stream = cfg.stream();\n> -\tret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width,\n> -\t\t\t\t cfg.size.height);\n> +\tret = viewfinder_->setFormat(cfg.pixelFormat,\n> +\t\t\t\t QSize(cfg.size.width, cfg.size.height));\n> \tif (ret < 0) {\n> \t\tstd::cout << \"Failed to set viewfinder format\" << std::endl;\n> \t\treturn ret;\n> diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\n> index f4602f07c5d2..066ac605e7b4 100644\n> --- a/src/qcam/viewfinder.cpp\n> +++ b/src/qcam/viewfinder.cpp\n> @@ -15,7 +15,7 @@\n> #include \"format_converter.h\"\n> \n> ViewFinder::ViewFinder(QWidget *parent)\n> -\t: QWidget(parent), format_(0), width_(0), height_(0), image_(nullptr)\n> +\t: QWidget(parent), format_(0), image_(nullptr)\n> {\n> }\n> \n> @@ -46,20 +46,19 @@ QImage ViewFinder::getCurrentImage()\n> }\n> \n> int ViewFinder::setFormat(const libcamera::PixelFormat &format,\n> -\t\t\t unsigned int width, unsigned int height)\n> +\t\t\t const QSize &size)\n> {\n> \tint ret;\n> \n> -\tret = converter_.configure(format, width, height);\n> +\tret = converter_.configure(format, size);\n> \tif (ret < 0)\n> \t\treturn ret;\n> \n> \tformat_ = format;\n> -\twidth_ = width;\n> -\theight_ = height;\n> +\tsize_ = size;\n> \n> \tdelete image_;\n> -\timage_ = new QImage(width, height, QImage::Format_RGB32);\n> +\timage_ = new QImage(size_, QImage::Format_RGB32);\n> \n> \tupdateGeometry();\n> \treturn 0;\n> @@ -73,5 +72,5 @@ void ViewFinder::paintEvent(QPaintEvent *)\n> \n> QSize ViewFinder::sizeHint() const\n> {\n> -\treturn image_ ? image_->size() : QSize(640, 480);\n> +\treturn size_.isValid() ? size_ : QSize(640, 480);\n> }\n> diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> index 0549f038edd6..a019c3a470ea 100644\n> --- a/src/qcam/viewfinder.h\n> +++ b/src/qcam/viewfinder.h\n> @@ -8,6 +8,7 @@\n> #define __QCAM_VIEWFINDER_H__\n> \n> #include \n> +#include \n> #include \n> \n> #include \n> @@ -22,8 +23,7 @@ public:\n> \tViewFinder(QWidget *parent);\n> \t~ViewFinder();\n> \n> -\tint setFormat(const libcamera::PixelFormat &format, unsigned int width,\n> -\t\t unsigned int height);\n> +\tint setFormat(const libcamera::PixelFormat &format, const QSize &size);\n> \tvoid display(const unsigned char *rgb, size_t size);\n> \n> \tQImage getCurrentImage();\n> @@ -33,12 +33,11 @@ protected:\n> \tQSize sizeHint() const override;\n> \n> private:\n> -\tlibcamera::PixelFormat format_;\n> -\tunsigned int width_;\n> -\tunsigned int height_;\n> -\n> \tFormatConverter converter_;\n> \n> +\tlibcamera::PixelFormat format_;\n> +\tQSize size_;\n> +\n> \tQImage *image_;\n> \tQMutex mutex_; /* Prevent concurrent access to image_ */\n> };\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 599AA62C0E\n\tfor ;\n\tMon, 23 Mar 2020 15:44:12 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A5605308;\n\tMon, 23 Mar 2020 15:44:11 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584974652;\n\tbh=b2WqHI+9e3xobkL9tFXP59AUzJlq5l6e1tkut41UQSA=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=WlJ4IxfJiRJ3SkXj2+IAYojqDlvKEjWkXFbLzcMZnKlS9RxEHnMKHIJnOI5OBnk08\n\tzrikma0GQu1bC0t0k/8cXKjU6PTUGc9XpRFQNDoCmQ6AC+YYlwMY/hhPvWzU5rJTXP\n\tPJTcIslepmyyRU+WX95Wm7l0PN1ZZ2YwuDSE/b8U=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200323142205.28342-1-laurent.pinchart@ideasonboard.com>\n\t<20200323142205.28342-4-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<3c03445d-053d-9c58-c6a8-bbed24a45fe8@ideasonboard.com>","Date":"Mon, 23 Mar 2020 14:44:08 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200323142205.28342-4-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 03/21] qcam: Use QSize through the\n\tcode base","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 23 Mar 2020 14:44:12 -0000"}}]