From patchwork Fri Sep 11 08:55:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Show Liu X-Patchwork-Id: 9569 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 9D5BABDB1D for ; Fri, 11 Sep 2020 08:55:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6803962D6E; Fri, 11 Sep 2020 10:55:45 +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="H0lo110b"; dkim-atps=neutral Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4676B62D5B for ; Fri, 11 Sep 2020 10:55:44 +0200 (CEST) Received: by mail-pg1-x543.google.com with SMTP id g29so6194174pgl.2 for ; Fri, 11 Sep 2020 01:55:44 -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=BWIcO9CF7ffOFNxyBar68aMjB+PR1UiV1lXSBRWX9k8=; b=H0lo110btfID3OM6i5dD9ZVNRwBf3Ysj1mC00CLeqzdrjEHygEB/oo0OTKBaRfZvlk Bgs3UiA6y9pNI+Ld4QCk9J1W559mwlscKMXpA4L7f2FYuGuBj4HD6khdQP2hYy921sgY CayOxW/M7RAqjVdu96bUO+b3KV7jvuCTeUNDYKLdOE/kmbW9vFC8PyVF6JogNe1VXTTE IlvHer+P4bqhwP/fNwZh6mbjyap8GDTxd6GIu30+QrKNn2t+QKRvWwPMBGtfOpd7IVnM cWR4NK6h2n0mu/ZXAHc0t/DwBx/1XRlxh/d2QCjWe3ybcEvqniwy3C6fm5kO7zKlyIu5 xj0w== 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=BWIcO9CF7ffOFNxyBar68aMjB+PR1UiV1lXSBRWX9k8=; b=JctE9mZYS1D/irjLHgU5//DoyMlITJX+4XnLvC1VLe8QEj3C+o9COa/hQDP2ymYlD6 cdEQ1DgF/BK3dg4viDF6BVHbLRYtvUQNb+Ik1huk21DtC7C1F7BqRGPXXCXsNFbwV+/L zH3nG5G4MAHhOLUm0rDPUvT6wy7L4yWagB++pqHpGwbCFth7deS2cK53Knzdw+UcVcKU +Ldl10Lmg7dKiSmgx+FzWfs2eHbF4by5hzsbat3cobRlWOy1PgwIfo2zMLg2f6IP1uk/ /IpvPTWEDIzqEkYnC3KHDFpAvBfRVC2J15cyqABxLRruu0NAlug1LaVyd2CcGGdL/Tky TEzQ== X-Gm-Message-State: AOAM532w2Idb7QjxosrRJNRg4oAGBE1/Eqms/g56/79/2xYQ53ACTpQv lb8VcAuhf5u57SYVolJhalK3jMFm2UUlog== X-Google-Smtp-Source: ABdhPJyEglQOwehYA9/+pA55FnWp1CWeRwvlgCoFghh97tyctFDI5V7pJc9ou4KuEnJXpMxGUNVIKw== X-Received: by 2002:a62:93:0:b029:13e:d13d:a085 with SMTP id 141-20020a6200930000b029013ed13da085mr1260818pfa.28.1599814542653; Fri, 11 Sep 2020 01:55:42 -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 w192sm1616543pfd.156.2020.09.11.01.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 01:55:42 -0700 (PDT) From: Show Liu To: libcamera-devel@lists.libcamera.org Date: Fri, 11 Sep 2020 16:55:12 +0800 Message-Id: <20200911085514.30021-3-show.liu@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200911085514.30021-1-show.liu@linaro.org> References: <20200911085514.30021-1-show.liu@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 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 QPainter-based ViewFinder Signed-off-by: Show Liu Reviewed-by: Laurent Pinchart --- src/qcam/meson.build | 4 +- src/qcam/viewfinder.h | 57 ++++------------- .../{viewfinder.cpp => viewfinder_qt.cpp} | 24 +++---- src/qcam/viewfinder_qt.h | 64 +++++++++++++++++++ 4 files changed, 89 insertions(+), 60 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..67da1df 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(); - - const QList &nativeFormats() const; - - int setFormat(const libcamera::PixelFormat &format, const QSize &size); - void render(libcamera::FrameBuffer *buffer, MappedBuffer *map); - void stop(); - - QImage getCurrentImage(); - -Q_SIGNALS: - void renderComplete(libcamera::FrameBuffer *buffer); - -protected: - void paintEvent(QPaintEvent *) override; - QSize sizeHint() const override; - -private: - FormatConverter converter_; + virtual ~ViewFinder() {} - libcamera::PixelFormat format_; - QSize size_; + virtual const QList &nativeFormats() const = 0; - /* Camera stopped icon */ - QSize vfSize_; - QIcon icon_; - QPixmap pixmap_; + virtual int setFormat(const libcamera::PixelFormat &format, const QSize &size) = 0; + virtual void render(libcamera::FrameBuffer *buffer, MappedBuffer *map) = 0; + virtual void stop() = 0; - /* 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..e436714 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 0000000..d755428 --- /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__ */