From patchwork Fri Sep 4 08:43:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Show Liu X-Patchwork-Id: 9483 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 92A4BBE174 for ; Fri, 4 Sep 2020 08:43:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5076562B29; Fri, 4 Sep 2020 10:43:46 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="YfyR6bOo"; dkim-atps=neutral Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 75CB262901 for ; Fri, 4 Sep 2020 10:43:45 +0200 (CEST) Received: by mail-pf1-x443.google.com with SMTP id k15so4210587pfc.12 for ; Fri, 04 Sep 2020 01:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XUh/XGCaEuZ2KgtjZ42uPYeWJaBuSzbZ7pxxaPvQamc=; b=YfyR6bOoCPjtAlLUUOpAdFr3lVYUjHBYdS1dODZkzZlWR8fDShC15vsdhXP90IrLIw 9ng85cidcO4YkQ3SLytYRkJx8plkwx5wlP2YoqtORMl9zYD8yAIAKdm+GFfbrwAmSq5T jEoAH9o3n3754VwYcKoSTjxoauIrAMKoJOFv7unzL/YDv64gFVzTjsdUpgsVARpbHEE4 AZgNXeC7BwdHlAnUpx2qNlJ5EoRVbr1WC2d60Dk861id11MgjJx3yqS2efoG2K/V8KAA YIKk1ca1KEboRRjFIlWG9skoC3/YtphVEDq8b1Asj7sEvrqNM1+d6fc8QoPRvqfNiT0E jVRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XUh/XGCaEuZ2KgtjZ42uPYeWJaBuSzbZ7pxxaPvQamc=; b=jhiUxVxtEi1AsfGHATluHb6uQdz0K0jBL6ReNWmVI3pFDofYqgyGEgs3/Ytx2ub8P/ E2pVbeQ5qMGJRmmFO5kWnNhX3xM5sWsWmpxQ/CTytbVV8+jHvynjekni4NBMfSvN19Fi ONnvBYyUNSxeGRnw29buGT5CsdRriAqp7vdWkFPk0Y/EllkgZ+dWaKWkV1nAzjrgteul UO1F4Gt7SU4Xc3i3PNmkARup77dcXZ7FBJvgOnfc+vLRUmsi7R8dTOGPcE68aRuxWfK8 sUX0vHIcTvh/LQTLMpaeToJIL18+3xIrELkaRXLEOO5eOp3VGJdgdm8hIGktsIdm7+SV dzcw== X-Gm-Message-State: AOAM533nQVLBE40j9jSK2nHXVfKscn68HGZz6Z7k+xE49VXabwMlj/PK BQEwv4tpduNnqYy5frsvocgcbldK4Ls6tA== X-Google-Smtp-Source: ABdhPJw/TTehSobwgnIKAenUEpLlyEtxeZOfv0EaOM5niPwxa9XEDlZiVfBvyHAkptbojdqbF5c4dw== X-Received: by 2002:aa7:9685:: with SMTP id f5mr7796643pfk.232.1599209023864; Fri, 04 Sep 2020 01:43:43 -0700 (PDT) Received: from localhost.localdomain (211-20-20-223.HINET-IP.hinet.net. [211.20.20.223]) by smtp.gmail.com with ESMTPSA id a6sm5202148pgt.70.2020.09.04.01.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 01:43:43 -0700 (PDT) From: Show Liu To: libcamera-devel@lists.libcamera.org Date: Fri, 4 Sep 2020 16:43:14 +0800 Message-Id: <20200904084316.7319-4-show.liu@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200904084316.7319-1-show.liu@linaro.org> References: <20200904084316.7319-1-show.liu@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 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" Create viewfinder base class and rename the original viewfinder as default Qt render widget Signed-off-by: Show Liu Reviewed-by: Laurent Pinchart --- src/qcam/meson.build | 4 +- src/qcam/viewfinder.h | 60 ++++------------- .../{viewfinder.cpp => viewfinder_qt.cpp} | 24 +++---- src/qcam/viewfinder_qt.h | 67 +++++++++++++++++++ 4 files changed, 94 insertions(+), 61 deletions(-) rename src/qcam/{viewfinder.cpp => viewfinder_qt.cpp} (86%) create mode 100644 src/qcam/viewfinder_qt.h diff --git a/src/qcam/meson.build b/src/qcam/meson.build index e0c6f26..a4bad0a 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 26a1320..fa7785f 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -2,70 +2,36 @@ /* * 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 - -#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(); - - const QList &nativeFormats() const; + ViewFinder(){}; + virtual ~ViewFinder(){}; - int setFormat(const libcamera::PixelFormat &format, const QSize &size); - void render(libcamera::FrameBuffer *buffer, MappedBuffer *map); - void stop(); + virtual const QList &nativeFormats() const = 0; - QImage getCurrentImage(); + virtual int setFormat(const libcamera::PixelFormat &format, const QSize &size) = 0; + virtual void render(libcamera::FrameBuffer *buffer, MappedBuffer *map) = 0; + virtual void stop() = 0; -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 dcf8a15..072f024 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 - default Viewfinder for rendering by Qt */ -#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 0000000..ee2abab --- /dev/null +++ b/src/qcam/viewfinder_qt.h @@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * viewfinder_qt.h - qcam - default Viewfinder for rendering by Qt + */ +#ifndef __QCAM_VIEWFINDER_QT_H__ +#define __QCAM_VIEWFINDER_QT_H__ + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "format_converter.h" +#include "viewfinder.h" + +class QImage; + +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__ */