From patchwork Mon Mar 23 14:22:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3263 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7BC5562C90 for ; Mon, 23 Mar 2020 15:22:25 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 24E82308 for ; Mon, 23 Mar 2020 15:22:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584973345; bh=wyjNonEx8jFAhcUPkQCz7VR6tyWoj/JFy6i6LmH5R/4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=aijlcRlBowSDsgzIzjvngr6ShRm4KNGrsXsMWtPH7CBs1IpUPMbAAdGHRzhtUvJZe voEtgJvydhpXW1rbdN5wGTAtC0ys36AyK8nW3HEEeXIG188hPWKLkYsVL0849+Ca6U UugITBoFEHDYfawChO4XjG82BNlFjPcZnGcPER3A= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 23 Mar 2020 16:22:04 +0200 Message-Id: <20200323142205.28342-21-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200323142205.28342-1-laurent.pinchart@ideasonboard.com> References: <20200323142205.28342-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 20/21] qcam: viewfinder: Display icon when stopping capture 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: , X-List-Received-Date: Mon, 23 Mar 2020 14:22:29 -0000 When stopping capture, display an icon instead of the last frame. This is required to be able to release the last buffer when the viewfinder operators in zero-copy mode. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/qcam/assets/feathericons/feathericons.qrc | 1 + src/qcam/main_window.cpp | 2 + src/qcam/viewfinder.cpp | 44 ++++++++++++++++++- src/qcam/viewfinder.h | 8 ++++ 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/qcam/assets/feathericons/feathericons.qrc b/src/qcam/assets/feathericons/feathericons.qrc index 6ca3a846803c..c4eb7a0be688 100644 --- a/src/qcam/assets/feathericons/feathericons.qrc +++ b/src/qcam/assets/feathericons/feathericons.qrc @@ -1,5 +1,6 @@ +./camera-off.svg ./play-circle.svg ./save.svg ./stop-circle.svg diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index b68e171c5e01..a77d10bb7076 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -412,6 +412,8 @@ void MainWindow::stopCapture() if (!isCapturing_) return; + viewfinder_->stop(); + int ret = camera_->stop(); if (ret) qInfo() << "Failed to stop capture"; diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index 4c35659e24aa..a40b2b400daa 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -20,6 +20,7 @@ ViewFinder::ViewFinder(QWidget *parent) : QWidget(parent), buffer_(nullptr) { + icon_ = QIcon(":camera-off.svg"); } ViewFinder::~ViewFinder() @@ -89,6 +90,18 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map) renderComplete(buffer); } +void ViewFinder::stop() +{ + image_ = QImage(); + + if (buffer_) { + renderComplete(buffer_); + buffer_ = nullptr; + } + + update(); +} + QImage ViewFinder::getCurrentImage() { QMutexLocker locker(&mutex_); @@ -99,7 +112,36 @@ QImage ViewFinder::getCurrentImage() void ViewFinder::paintEvent(QPaintEvent *) { QPainter painter(this); - painter.drawImage(rect(), image_, image_.rect()); + + /* If we have an image, draw it. */ + if (!image_.isNull()) { + painter.drawImage(rect(), image_, image_.rect()); + return; + } + + /* + * Otherwise, draw the camera stopped icon. Render it to the pixmap if + * the size has changed. + */ + constexpr int margin = 20; + + if (vfSize_ != size() || pixmap_.isNull()) { + vfSize_ = size(); + + QSize pixmapSize{ 1, 1 }; + pixmapSize.scale(vfSize_.shrunkBy({ margin, margin, margin, margin }), + Qt::KeepAspectRatio); + pixmap_ = icon_.pixmap(pixmapSize); + } + + QPoint point{ margin, margin }; + if (pixmap_.width() < width() - 2 * margin) + point.setX((width() - pixmap_.width()) / 2); + else + point.setY((height() - pixmap_.height()) / 2); + + painter.setBackgroundMode(Qt::OpaqueMode); + painter.drawPixmap(point, pixmap_); } QSize ViewFinder::sizeHint() const diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index b5153160f70e..1a27f99ea202 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -9,6 +9,7 @@ #include +#include #include #include #include @@ -36,6 +37,7 @@ public: int setFormat(const libcamera::PixelFormat &format, const QSize &size); void render(libcamera::FrameBuffer *buffer, MappedBuffer *map); + void stop(); QImage getCurrentImage(); @@ -52,6 +54,12 @@ private: 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_ */