From patchwork Fri Mar 20 08:50:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Show Liu X-Patchwork-Id: 3223 Return-Path: Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 36EE46041A for ; Fri, 20 Mar 2020 09:59:19 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id t16so2219183plr.8 for ; Fri, 20 Mar 2020 01:59:19 -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=e8/rrufqMpW38N/W4gbu95fcU3yNy1Ck/MLkXMK1XJA=; b=iS/6QNVgW7BA0K26nJ6t3uJ62xpmBmVSmQ6QxeIFnn++s5y7Q2HwJIH/axJF1nWLcl exwXYgV6jWIiCmUzFijXvx1uYVF97KtmB+zk6ndHYid4eOW8WORPN3zvw0X/mPYtMSAR +WPXFYf6kmP7QeqSbRgsrl6ODgtuBghFo2K3nHYOhUKsXSBbZ2dB6OCmGb2JPcd+t5Ss Pg73e4Vp7Uk5AyYRl3mDvJ0v7AwSX2yQMR41FYOYzjHVwHpDN39dEq7rkVxsicHdZPTK DiYYLMmYGxIQH5Dc9/FYk2qO0QfoDVhgVugd1fTH76sakwepgEjfzNNP6zUJ7/nHDhMS gs5Q== 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=e8/rrufqMpW38N/W4gbu95fcU3yNy1Ck/MLkXMK1XJA=; b=C4mVferAIHjl+m/EIow89I9oRPEkq+acjRwnzjv+Jw+iZxAUZkfRtvpJr5njV/pskD i2aEaNSCMtov4Lo7XOYZVRcw8lXfs82MCUPqKw0Vp8kmW1wH04rn1ejpPTEAO/hknKEo WPfavdtKoekaXHdWxKZ0wKclPkbvXZE5LWI89aISTbwQbE2GWAmgpPZhSvU4kA2gBm2w ksw+i0lPw6nlDlMTrW1upBydnSJwrEGYXL25+uH46NCoKseCYPfy/YR08speMbNIHdxC 3GO4KrlS2r86+EihyRFg+4b/5D99bcuVnYIDVBcmeOOJUnilz7z6gw8s5/iCLzplgrSs C79g== X-Gm-Message-State: ANhLgQ1VKRmLF1Dow4mn5I9hBtpV7Qge0OPL8wvauIIoAHTHzG+XH2ep uOptf5JlqjfO0Sh1LqZYB5ixobWInqlSHA== X-Google-Smtp-Source: ADFU+vszhnmXePqTpJi+Jkcj3Np/NlKkI6aocyrN00G5r6vUqbB83qEOUAWqDvjs1EIEmSGMllnk/A== X-Received: by 2002:a17:90b:307:: with SMTP id ay7mr8414606pjb.123.1584694757653; Fri, 20 Mar 2020 01:59:17 -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 26sm4604653pfp.130.2020.03.20.01.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 01:59:17 -0700 (PDT) From: Show Liu To: libcamera-devel@lists.libcamera.org Date: Fri, 20 Mar 2020 16:50:29 +0800 Message-Id: <20200320085029.17875-4-show.liu@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200320085029.17875-1-show.liu@linaro.org> References: <20200320085029.17875-1-show.liu@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC] [PATCH 3/3] qcam: added an option to enable rendering via OpenGL shader 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: Fri, 20 Mar 2020 08:59:19 -0000 qcam: added an option to enable rendering via OpenGL shader Signed-off-by: Show Liu --- src/qcam/main.cpp | 2 ++ src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++--- src/qcam/main_window.h | 3 +++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp index a7ff5c5..7727a09 100644 --- a/src/qcam/main.cpp +++ b/src/qcam/main.cpp @@ -39,6 +39,8 @@ OptionsParser::Options parseOptions(int argc, char *argv[]) "help"); parser.addOption(OptSize, &sizeParser, "Set the stream size", "size", true); + parser.addOption(OptOpengl, OptionNone, "Enable YUV format via OpenGL shader", + "opengl"); OptionsParser::Options options = parser.parse(argc, argv); if (options.isSet(OptHelp)) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 98e55ba..5a5bc88 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -28,6 +28,7 @@ #include "main_window.h" #include "viewfinder.h" +#include "glwidget.h" using namespace libcamera; @@ -43,7 +44,14 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) connect(&titleTimer_, SIGNAL(timeout()), this, SLOT(updateTitle())); viewfinder_ = new ViewFinder(this); - setCentralWidget(viewfinder_); + glwidget_ = new GLWidget(this); + + if (options_.isSet(OptOpengl)) { + setCentralWidget(glwidget_); + } else { + setCentralWidget(viewfinder_); + } + adjustSize(); ret = openCamera(); @@ -232,6 +240,7 @@ int MainWindow::startCapture() } Stream *stream = cfg.stream(); + ret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width, cfg.size.height); if (ret < 0) { @@ -239,6 +248,11 @@ int MainWindow::startCapture() return ret; } + if (options_.isSet(OptOpengl)) { + glwidget_->setFrameSize(cfg.size.width, cfg.size.height); + glwidget_->setFixedSize(cfg.size.width, cfg.size.height); + } + statusBar()->showMessage(QString(cfg.toString().c_str())); adjustSize(); @@ -353,7 +367,13 @@ void MainWindow::stopCapture() void MainWindow::saveImageAs() { - QImage image = viewfinder_->getCurrentImage(); + QImage image; + if (options_.isSet(OptOpengl)) { + image = glwidget_->grabFramebuffer(); + } else { + image = viewfinder_->getCurrentImage(); + } + QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation); QString filename = QFileDialog::getSaveFileName(this, "Save Image", defaultPath, @@ -416,7 +436,12 @@ int MainWindow::display(FrameBuffer *buffer) const FrameBuffer::Plane &plane = buffer->planes().front(); void *memory = mappedBuffers_[plane.fd.fd()].first; unsigned char *raw = static_cast(memory); - viewfinder_->display(raw, buffer->metadata().planes[0].bytesused); + + if (options_.isSet(OptOpengl)) { + glwidget_->updateFrame(raw); + } else { + viewfinder_->display(raw, buffer->metadata().planes[0].bytesused); + } return 0; } diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 40aa10a..5501dd1 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -21,6 +21,7 @@ #include #include "../cam/options.h" +#include "glwidget.h" using namespace libcamera; @@ -30,6 +31,7 @@ enum { OptCamera = 'c', OptHelp = 'h', OptSize = 's', + OptOpengl = 'o', }; class MainWindow : public QMainWindow @@ -79,6 +81,7 @@ private: QToolBar *toolbar_; ViewFinder *viewfinder_; + GLWidget *glwidget_; std::map> mappedBuffers_; };