From patchwork Tue Sep 15 02:46:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9608 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9F506C3B5B for ; Tue, 15 Sep 2020 02:46:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 559F162E05; Tue, 15 Sep 2020 04:46:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CsG7VTnv"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BCE0762D5B for ; Tue, 15 Sep 2020 04:46:55 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4CB51AEA; Tue, 15 Sep 2020 04:46:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600138015; bh=w6o4nKMygS/L0eAQLoPuFVS6f+zH4jLajwK1pF6YWok=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CsG7VTnv2daBXM3qaI97oOPrKIXZRdqwsxdMupGAd7yvbv+zrcaFjEIPEWtV9xbgv CJu04JCYm3dO7nuRo+isksFsghLucPYxqwTyqFrmjCcf9dQ07gwgkLEI1dRr4MV1G3 Y8gxmhDzef088A1MEkkwo7q3dKzG1UnjQjmrT3wk= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org, Show Liu Date: Tue, 15 Sep 2020 05:46:21 +0300 Message-Id: <20200915024623.30667-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200915024623.30667-1-laurent.pinchart@ideasonboard.com> References: <20200915024623.30667-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v7 2/4] qcam: New viewfinder hierarchy 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Show Liu Create ViewFinder base class and rename the original ViewFinder as QPainter-based ViewFinder. Signed-off-by: Show Liu Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/qcam/main_window.cpp | 8 ++- src/qcam/meson.build | 4 +- src/qcam/viewfinder.h | 57 ++++------------- .../{viewfinder.cpp => viewfinder_qt.cpp} | 24 +++---- src/qcam/viewfinder_qt.h | 64 +++++++++++++++++++ 5 files changed, 94 insertions(+), 63 deletions(-) rename src/qcam/{viewfinder.cpp => viewfinder_qt.cpp} (86%) create mode 100644 src/qcam/viewfinder_qt.h diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 612d978a73df..7406f0bd4512 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -28,6 +28,7 @@ #include #include "dng_writer.h" +#include "viewfinder_qt.h" using namespace libcamera; @@ -105,10 +106,11 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) setWindowTitle(title_); connect(&titleTimer_, SIGNAL(timeout()), this, SLOT(updateTitle())); - viewfinder_ = new ViewFinder(this); - connect(viewfinder_, &ViewFinder::renderComplete, + ViewFinderQt *viewfinder = new ViewFinderQt(this); + connect(viewfinder, &ViewFinderQt::renderComplete, this, &MainWindow::queueRequest); - setCentralWidget(viewfinder_); + viewfinder_ = viewfinder; + setCentralWidget(viewfinder); adjustSize(); /* Hotplug/unplug support */ diff --git a/src/qcam/meson.build b/src/qcam/meson.build index e0c6f26dfef5..a4bad0a0659e 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -6,12 +6,12 @@ qcam_sources = files([ 'format_converter.cpp', 'main.cpp', 'main_window.cpp', - 'viewfinder.cpp', + 'viewfinder_qt.cpp', ]) qcam_moc_headers = files([ 'main_window.h', - 'viewfinder.h', + 'viewfinder_qt.h', ]) qcam_resources = files([ diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index 26a1320537d2..67da1df26a0c 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -2,70 +2,35 @@ /* * Copyright (C) 2019, Google Inc. * - * viewfinder.h - qcam - Viewfinder + * viewfinder.h - qcam - Viewfinder base class */ #ifndef __QCAM_VIEWFINDER_H__ #define __QCAM_VIEWFINDER_H__ -#include - -#include -#include #include -#include +#include #include -#include #include -#include - -#include "format_converter.h" - -class QImage; +#include struct MappedBuffer { void *memory; size_t size; }; -class ViewFinder : public QWidget +class ViewFinder { - Q_OBJECT - public: - ViewFinder(QWidget *parent); - ~ViewFinder(); + virtual ~ViewFinder() {} - const QList &nativeFormats() const; + virtual const QList &nativeFormats() const = 0; - int setFormat(const libcamera::PixelFormat &format, const QSize &size); - void render(libcamera::FrameBuffer *buffer, MappedBuffer *map); - void stop(); + virtual int setFormat(const libcamera::PixelFormat &format, const QSize &size) = 0; + virtual void render(libcamera::FrameBuffer *buffer, MappedBuffer *map) = 0; + virtual void stop() = 0; - QImage getCurrentImage(); - -Q_SIGNALS: - void renderComplete(libcamera::FrameBuffer *buffer); - -protected: - void paintEvent(QPaintEvent *) override; - QSize sizeHint() const override; - -private: - FormatConverter converter_; - - libcamera::PixelFormat format_; - QSize size_; - - /* Camera stopped icon */ - QSize vfSize_; - QIcon icon_; - QPixmap pixmap_; - - /* Buffer and render image */ - libcamera::FrameBuffer *buffer_; - QImage image_; - QMutex mutex_; /* Prevent concurrent access to image_ */ + virtual QImage getCurrentImage() = 0; }; -#endif /* __QCAM_VIEWFINDER__ */ +#endif /* __QCAM_VIEWFINDER_H__ */ diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder_qt.cpp similarity index 86% rename from src/qcam/viewfinder.cpp rename to src/qcam/viewfinder_qt.cpp index dcf8a15d2df6..e436714c6bdb 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder_qt.cpp @@ -2,10 +2,10 @@ /* * Copyright (C) 2019, Google Inc. * - * viewfinder.cpp - qcam - Viewfinder + * viewfinder_qt.cpp - qcam - QPainter-based ViewFinder */ -#include "viewfinder.h" +#include "viewfinder_qt.h" #include #include @@ -33,24 +33,24 @@ static const QMap nativeFormats { libcamera::formats::BGR888, QImage::Format_RGB888 }, }; -ViewFinder::ViewFinder(QWidget *parent) +ViewFinderQt::ViewFinderQt(QWidget *parent) : QWidget(parent), buffer_(nullptr) { icon_ = QIcon(":camera-off.svg"); } -ViewFinder::~ViewFinder() +ViewFinderQt::~ViewFinderQt() { } -const QList &ViewFinder::nativeFormats() const +const QList &ViewFinderQt::nativeFormats() const { static const QList formats = ::nativeFormats.keys(); return formats; } -int ViewFinder::setFormat(const libcamera::PixelFormat &format, - const QSize &size) +int ViewFinderQt::setFormat(const libcamera::PixelFormat &format, + const QSize &size) { image_ = QImage(); @@ -78,7 +78,7 @@ int ViewFinder::setFormat(const libcamera::PixelFormat &format, return 0; } -void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map) +void ViewFinderQt::render(libcamera::FrameBuffer *buffer, MappedBuffer *map) { if (buffer->planes().size() != 1) { qWarning() << "Multi-planar buffers are not supported"; @@ -121,7 +121,7 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map) renderComplete(buffer); } -void ViewFinder::stop() +void ViewFinderQt::stop() { image_ = QImage(); @@ -133,14 +133,14 @@ void ViewFinder::stop() update(); } -QImage ViewFinder::getCurrentImage() +QImage ViewFinderQt::getCurrentImage() { QMutexLocker locker(&mutex_); return image_.copy(); } -void ViewFinder::paintEvent(QPaintEvent *) +void ViewFinderQt::paintEvent(QPaintEvent *) { QPainter painter(this); @@ -175,7 +175,7 @@ void ViewFinder::paintEvent(QPaintEvent *) painter.drawPixmap(point, pixmap_); } -QSize ViewFinder::sizeHint() const +QSize ViewFinderQt::sizeHint() const { return size_.isValid() ? size_ : QSize(640, 480); } diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h new file mode 100644 index 000000000000..d755428887c0 --- /dev/null +++ b/src/qcam/viewfinder_qt.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * viewfinder_qt.h - qcam - QPainter-based ViewFinder + */ +#ifndef __QCAM_VIEWFINDER_QT_H__ +#define __QCAM_VIEWFINDER_QT_H__ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "format_converter.h" +#include "viewfinder.h" + +class ViewFinderQt : public QWidget, public ViewFinder +{ + Q_OBJECT + +public: + ViewFinderQt(QWidget *parent); + ~ViewFinderQt(); + + const QList &nativeFormats() const override; + + int setFormat(const libcamera::PixelFormat &format, const QSize &size) override; + void render(libcamera::FrameBuffer *buffer, MappedBuffer *map) override; + void stop() override; + + QImage getCurrentImage() override; + +Q_SIGNALS: + void renderComplete(libcamera::FrameBuffer *buffer); + +protected: + void paintEvent(QPaintEvent *) override; + QSize sizeHint() const override; + +private: + FormatConverter converter_; + + libcamera::PixelFormat format_; + QSize size_; + + /* Camera stopped icon */ + QSize vfSize_; + QIcon icon_; + QPixmap pixmap_; + + /* Buffer and render image */ + libcamera::FrameBuffer *buffer_; + QImage image_; + QMutex mutex_; /* Prevent concurrent access to image_ */ +}; + +#endif /* __QCAM_VIEWFINDER_QT_H__ */