From acd02afab0298bc91099fa280f13775e8e5e315b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 22 Mar 2020 12:53:13 +0200 Subject: qcam: Use QSize through the code base Qt has a QSize class to store sizes. Use it to replace width and height where applicable. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/qcam/format_converter.cpp | 6 +++--- src/qcam/format_converter.h | 5 +++-- src/qcam/main_window.cpp | 4 ++-- src/qcam/viewfinder.cpp | 13 ++++++------- src/qcam/viewfinder.h | 11 +++++------ 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index d8962a28..bf887ad4 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -26,7 +26,7 @@ #endif int FormatConverter::configure(const libcamera::PixelFormat &format, - unsigned int width, unsigned int height) + const QSize &size) { switch (format) { case DRM_FORMAT_NV12: @@ -139,8 +139,8 @@ int FormatConverter::configure(const libcamera::PixelFormat &format, }; format_ = format; - width_ = width; - height_ = height; + width_ = size.width(); + height_ = size.height(); return 0; } diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h index 96bde238..5e28adf0 100644 --- a/src/qcam/format_converter.h +++ b/src/qcam/format_converter.h @@ -9,6 +9,8 @@ #include +#include + #include class QImage; @@ -16,8 +18,7 @@ class QImage; class FormatConverter { public: - int configure(const libcamera::PixelFormat &format, unsigned int width, - unsigned int height); + int configure(const libcamera::PixelFormat &format, const QSize &size); void convert(const unsigned char *src, size_t size, QImage *dst); diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 66aaf40c..e0668176 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -232,8 +232,8 @@ int MainWindow::startCapture() } Stream *stream = cfg.stream(); - ret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width, - cfg.size.height); + ret = viewfinder_->setFormat(cfg.pixelFormat, + QSize(cfg.size.width, cfg.size.height)); if (ret < 0) { std::cout << "Failed to set viewfinder format" << std::endl; return ret; diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index f4602f07..066ac605 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -15,7 +15,7 @@ #include "format_converter.h" ViewFinder::ViewFinder(QWidget *parent) - : QWidget(parent), format_(0), width_(0), height_(0), image_(nullptr) + : QWidget(parent), format_(0), image_(nullptr) { } @@ -46,20 +46,19 @@ QImage ViewFinder::getCurrentImage() } int ViewFinder::setFormat(const libcamera::PixelFormat &format, - unsigned int width, unsigned int height) + const QSize &size) { int ret; - ret = converter_.configure(format, width, height); + ret = converter_.configure(format, size); if (ret < 0) return ret; format_ = format; - width_ = width; - height_ = height; + size_ = size; delete image_; - image_ = new QImage(width, height, QImage::Format_RGB32); + image_ = new QImage(size_, QImage::Format_RGB32); updateGeometry(); return 0; @@ -73,5 +72,5 @@ void ViewFinder::paintEvent(QPaintEvent *) QSize ViewFinder::sizeHint() const { - return image_ ? image_->size() : QSize(640, 480); + return size_.isValid() ? size_ : QSize(640, 480); } diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index 0549f038..a019c3a4 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -8,6 +8,7 @@ #define __QCAM_VIEWFINDER_H__ #include +#include #include #include @@ -22,8 +23,7 @@ public: ViewFinder(QWidget *parent); ~ViewFinder(); - int setFormat(const libcamera::PixelFormat &format, unsigned int width, - unsigned int height); + int setFormat(const libcamera::PixelFormat &format, const QSize &size); void display(const unsigned char *rgb, size_t size); QImage getCurrentImage(); @@ -33,12 +33,11 @@ protected: QSize sizeHint() const override; private: - libcamera::PixelFormat format_; - unsigned int width_; - unsigned int height_; - FormatConverter converter_; + libcamera::PixelFormat format_; + QSize size_; + QImage *image_; QMutex mutex_; /* Prevent concurrent access to image_ */ }; -- cgit v1.2.1