Patch Detail
Show a patch.
GET /api/1.1/patches/3223/?format=api
{ "id": 3223, "url": "https://patchwork.libcamera.org/api/1.1/patches/3223/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3223/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200320085029.17875-4-show.liu@linaro.org>", "date": "2020-03-20T08:50:29", "name": "[libcamera-devel,RFC,3/3] qcam: added an option to enable rendering via OpenGL shader", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "379a231726248902c23a1b92ecf0f8f39c60d970", "submitter": { "id": 24, "url": "https://patchwork.libcamera.org/api/1.1/people/24/?format=api", "name": "Show Liu", "email": "show.liu@linaro.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3223/mbox/", "series": [ { "id": 750, "url": "https://patchwork.libcamera.org/api/1.1/series/750/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=750", "date": "2020-03-20T08:50:26", "name": "Add an option to enable rendering YUV frame by OpenGL shader", "version": 1, "mbox": "https://patchwork.libcamera.org/series/750/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3223/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3223/checks/", "tags": {}, "headers": { "Return-Path": "<show.liu@linaro.org>", "Received": [ "from mail-pl1-x631.google.com (mail-pl1-x631.google.com\n\t[IPv6:2607:f8b0:4864:20::631])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 36EE46041A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 Mar 2020 09:59:19 +0100 (CET)", "by mail-pl1-x631.google.com with SMTP id t16so2219183plr.8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 Mar 2020 01:59:19 -0700 (PDT)", "from localhost.localdomain (211-20-20-223.HINET-IP.hinet.net.\n\t[211.20.20.223]) by smtp.gmail.com with ESMTPSA id\n\t26sm4604653pfp.130.2020.03.20.01.59.16\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 20 Mar 2020 01:59:17 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=e8/rrufqMpW38N/W4gbu95fcU3yNy1Ck/MLkXMK1XJA=;\n\tb=iS/6QNVgW7BA0K26nJ6t3uJ62xpmBmVSmQ6QxeIFnn++s5y7Q2HwJIH/axJF1nWLcl\n\texwXYgV6jWIiCmUzFijXvx1uYVF97KtmB+zk6ndHYid4eOW8WORPN3zvw0X/mPYtMSAR\n\t+WPXFYf6kmP7QeqSbRgsrl6ODgtuBghFo2K3nHYOhUKsXSBbZ2dB6OCmGb2JPcd+t5Ss\n\tPg73e4Vp7Uk5AyYRl3mDvJ0v7AwSX2yQMR41FYOYzjHVwHpDN39dEq7rkVxsicHdZPTK\n\tDiYYLMmYGxIQH5Dc9/FYk2qO0QfoDVhgVugd1fTH76sakwepgEjfzNNP6zUJ7/nHDhMS\n\tgs5Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=e8/rrufqMpW38N/W4gbu95fcU3yNy1Ck/MLkXMK1XJA=;\n\tb=C4mVferAIHjl+m/EIow89I9oRPEkq+acjRwnzjv+Jw+iZxAUZkfRtvpJr5njV/pskD\n\ti2aEaNSCMtov4Lo7XOYZVRcw8lXfs82MCUPqKw0Vp8kmW1wH04rn1ejpPTEAO/hknKEo\n\tWPfavdtKoekaXHdWxKZ0wKclPkbvXZE5LWI89aISTbwQbE2GWAmgpPZhSvU4kA2gBm2w\n\tksw+i0lPw6nlDlMTrW1upBydnSJwrEGYXL25+uH46NCoKseCYPfy/YR08speMbNIHdxC\n\t3GO4KrlS2r86+EihyRFg+4b/5D99bcuVnYIDVBcmeOOJUnilz7z6gw8s5/iCLzplgrSs\n\tC79g==", "X-Gm-Message-State": "ANhLgQ1VKRmLF1Dow4mn5I9hBtpV7Qge0OPL8wvauIIoAHTHzG+XH2ep\n\tuOptf5JlqjfO0Sh1LqZYB5ixobWInqlSHA==", "X-Google-Smtp-Source": "ADFU+vszhnmXePqTpJi+Jkcj3Np/NlKkI6aocyrN00G5r6vUqbB83qEOUAWqDvjs1EIEmSGMllnk/A==", "X-Received": "by 2002:a17:90b:307:: with SMTP id\n\tay7mr8414606pjb.123.1584694757653; \n\tFri, 20 Mar 2020 01:59:17 -0700 (PDT)", "From": "Show Liu <show.liu@linaro.org>", "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", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC] [PATCH 3/3] qcam: added an option to enable\n\trendering via OpenGL shader", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Fri, 20 Mar 2020 08:59:19 -0000" }, "content": "qcam: added an option to enable rendering via OpenGL shader\n\nSigned-off-by: Show Liu <show.liu@linaro.org>\n---\n src/qcam/main.cpp | 2 ++\n src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++---\n src/qcam/main_window.h | 3 +++\n 3 files changed, 33 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\nindex a7ff5c5..7727a09 100644\n--- a/src/qcam/main.cpp\n+++ b/src/qcam/main.cpp\n@@ -39,6 +39,8 @@ OptionsParser::Options parseOptions(int argc, char *argv[])\n \t\t\t \"help\");\n \tparser.addOption(OptSize, &sizeParser, \"Set the stream size\",\n \t\t\t \"size\", true);\n+\tparser.addOption(OptOpengl, OptionNone, \"Enable YUV format via OpenGL shader\",\n+\t\t\t \"opengl\");\n \n \tOptionsParser::Options options = parser.parse(argc, argv);\n \tif (options.isSet(OptHelp))\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 98e55ba..5a5bc88 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -28,6 +28,7 @@\n \n #include \"main_window.h\"\n #include \"viewfinder.h\"\n+#include \"glwidget.h\"\n \n using namespace libcamera;\n \n@@ -43,7 +44,14 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n \tconnect(&titleTimer_, SIGNAL(timeout()), this, SLOT(updateTitle()));\n \n \tviewfinder_ = new ViewFinder(this);\n-\tsetCentralWidget(viewfinder_);\n+\tglwidget_ = new GLWidget(this);\n+\n+\tif (options_.isSet(OptOpengl)) {\n+\t\tsetCentralWidget(glwidget_);\n+\t} else {\n+\t\tsetCentralWidget(viewfinder_);\n+\t}\n+\n \tadjustSize();\n \n \tret = openCamera();\n@@ -232,6 +240,7 @@ int MainWindow::startCapture()\n \t}\n \n \tStream *stream = cfg.stream();\n+\n \tret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width,\n \t\t\t\t cfg.size.height);\n \tif (ret < 0) {\n@@ -239,6 +248,11 @@ int MainWindow::startCapture()\n \t\treturn ret;\n \t}\n \n+\tif (options_.isSet(OptOpengl)) {\n+\t\tglwidget_->setFrameSize(cfg.size.width, cfg.size.height);\n+\t\tglwidget_->setFixedSize(cfg.size.width, cfg.size.height);\n+\t}\n+\n \tstatusBar()->showMessage(QString(cfg.toString().c_str()));\n \n \tadjustSize();\n@@ -353,7 +367,13 @@ void MainWindow::stopCapture()\n \n void MainWindow::saveImageAs()\n {\n-\tQImage image = viewfinder_->getCurrentImage();\n+\tQImage image;\n+\tif (options_.isSet(OptOpengl)) {\n+\t\timage = glwidget_->grabFramebuffer();\n+\t} else {\n+\t\timage = viewfinder_->getCurrentImage();\n+\t}\n+\n \tQString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);\n \n \tQString filename = QFileDialog::getSaveFileName(this, \"Save Image\", defaultPath,\n@@ -416,7 +436,12 @@ int MainWindow::display(FrameBuffer *buffer)\n \tconst FrameBuffer::Plane &plane = buffer->planes().front();\n \tvoid *memory = mappedBuffers_[plane.fd.fd()].first;\n \tunsigned char *raw = static_cast<unsigned char *>(memory);\n-\tviewfinder_->display(raw, buffer->metadata().planes[0].bytesused);\n+\n+\tif (options_.isSet(OptOpengl)) {\n+\t\tglwidget_->updateFrame(raw);\n+\t} else {\n+\t\tviewfinder_->display(raw, buffer->metadata().planes[0].bytesused);\n+\t}\n \n \treturn 0;\n }\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex 40aa10a..5501dd1 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -21,6 +21,7 @@\n #include <libcamera/stream.h>\n \n #include \"../cam/options.h\"\n+#include \"glwidget.h\"\n \n using namespace libcamera;\n \n@@ -30,6 +31,7 @@ enum {\n \tOptCamera = 'c',\n \tOptHelp = 'h',\n \tOptSize = 's',\n+\tOptOpengl = 'o',\n };\n \n class MainWindow : public QMainWindow\n@@ -79,6 +81,7 @@ private:\n \n \tQToolBar *toolbar_;\n \tViewFinder *viewfinder_;\n+\tGLWidget *glwidget_;\n \tstd::map<int, std::pair<void *, unsigned int>> mappedBuffers_;\n };\n \n", "prefixes": [ "libcamera-devel", "RFC", "3/3" ] }