Patch Detail
Show a patch.
GET /api/1.1/patches/9484/?format=api
{ "id": 9484, "url": "https://patchwork.libcamera.org/api/1.1/patches/9484/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9484/", "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": "<20200904084316.7319-5-show.liu@linaro.org>", "date": "2020-09-04T08:43:15", "name": "[libcamera-devel,v5,3/4] qcam: add viewfinderGL class to accelerate the format convert", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f4a86bc92c961c5f9043fe25b4803e72e16347b4", "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/9484/mbox/", "series": [ { "id": 1262, "url": "https://patchwork.libcamera.org/api/1.1/series/1262/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1262", "date": "2020-09-04T08:43:11", "name": "qcam: accelerate format conversion by OpenGL shader", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1262/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9484/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9484/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id DEDAFBE174\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 4 Sep 2020 08:43:49 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A9E3462B2F;\n\tFri, 4 Sep 2020 10:43:49 +0200 (CEST)", "from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com\n\t[IPv6:2607:f8b0:4864:20::62d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E71E462B53\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 4 Sep 2020 10:43:47 +0200 (CEST)", "by mail-pl1-x62d.google.com with SMTP id k13so816274plk.13\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 04 Sep 2020 01:43:47 -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\ta6sm5202148pgt.70.2020.09.04.01.43.44\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 04 Sep 2020 01:43:45 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"HyKd0bAu\"; dkim-atps=neutral", "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=S1K5Qezo1F+B1oxZXo7RL/xyK70ykLOr3XuKqUwZJ7c=;\n\tb=HyKd0bAu8UM4gAdkTPdjoq9OJwDqYIstXh/Dyqmy9iCY+cFhK5Y7ZP8WV5O8uC4KvX\n\tjyFcdzL1Dlyq1kqLRiKfez4RuePVVkRMPAtcBLPbj99uRxsC+TLV7CEePefDmfjIpFyD\n\tCSTN1VCz1wa3mVZ+YZyFkSYp9XQn/oTphAZFeyD+670F29VX6y+4ePzoEeJIpd98Ftsd\n\t6o9idLvSsIQTjpSg76YR2P7KQKPkMXnhriZWttecv48tkrglpDgZbxLq5I92uS0sY/E9\n\tC6EISWVhhDBzk3FnJhaodizJ31PXBxI753UyPdj1+RJZ6FQ2UKqnRblG5NQO4oXiHnXC\n\tEWMQ==", "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=S1K5Qezo1F+B1oxZXo7RL/xyK70ykLOr3XuKqUwZJ7c=;\n\tb=EDQHN11jAxPhKymnAsG6l9x29BZEkx/JGaXlPf12qIAqUV1bQ5/tQABHkeGYTceUIU\n\trUk6cc2GBvJLd65ZIX306XSyhNBjaANGRZTGVaBNe3jBWxXdAlGpGwYDJy1P+uZzZzkI\n\tCiLtubBvcs6bwQelXH4kLMZsnF1iYHScRNsMgCMf5PHW+nTaMqIy/FfdxRw904jRgrGm\n\tClS8y2mZ+PPFz4pN0Rl24KzbZlKgvaMDXX7qMj3Kjne3J9H+oXN918e1hPQ34I5Loxl0\n\tfZonw74nkU538f2lLYRRsfU9rhVhpfcWuyhn+ihtmjRgL2BXAWRM6FWhhuiCW8y/5mFk\n\tMaLg==", "X-Gm-Message-State": "AOAM533QqINEQ1M/V19fT5doH4i7+SU7J9eDjnK3hvPrqDEmKJ1vIJPX\n\t6E7Gv9GRXMD1NH6HluOrrqPgIKWefEok1g==", "X-Google-Smtp-Source": "ABdhPJwIF0Vjn4F35tPkLU2wHp5GbdC9220ttmosu4/axTkbrjsLhWNSbvlz+bXAw4CrfnjLmZcRCQ==", "X-Received": "by 2002:a17:902:40a:: with SMTP id\n\t10mr631937ple.25.1599209026120; \n\tFri, 04 Sep 2020 01:43:46 -0700 (PDT)", "From": "Show Liu <show.liu@linaro.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 4 Sep 2020 16:43:15 +0800", "Message-Id": "<20200904084316.7319-5-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 3/4] qcam: add viewfinderGL class to\n\taccelerate the format convert", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "the viewfinderGL accelerates the format conversion by\nusing OpenGL ES shader\n\nSigned-off-by: Show Liu <show.liu@linaro.org>\n---\n src/qcam/meson.build | 2 +\n src/qcam/viewfinder_gl.cpp | 441 +++++++++++++++++++++++++++++++++++++\n src/qcam/viewfinder_gl.h | 97 ++++++++\n 3 files changed, 540 insertions(+)\n create mode 100644 src/qcam/viewfinder_gl.cpp\n create mode 100644 src/qcam/viewfinder_gl.h", "diff": "diff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex a4bad0a..32c0fc3 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -7,11 +7,13 @@ qcam_sources = files([\n 'main.cpp',\n 'main_window.cpp',\n 'viewfinder_qt.cpp',\n+ 'viewfinder_gl.cpp',\n ])\n \n qcam_moc_headers = files([\n 'main_window.h',\n 'viewfinder_qt.h',\n+ 'viewfinder_gl.h',\n ])\n \n qcam_resources = files([\ndiff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nnew file mode 100644\nindex 0000000..5591916\n--- /dev/null\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -0,0 +1,441 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * viewfinderGL.cpp - Render YUV format frame by OpenGL shader\n+ */\n+\n+#include \"viewfinder_gl.h\"\n+\n+#include <QImage>\n+\n+#include <libcamera/formats.h>\n+\n+#define ATTRIB_VERTEX 0\n+#define ATTRIB_TEXTURE 1\n+\n+static const QList<libcamera::PixelFormat> supportFormats{\n+\tlibcamera::formats::NV12,\n+\tlibcamera::formats::NV21,\n+\tlibcamera::formats::NV16,\n+\tlibcamera::formats::NV61,\n+\tlibcamera::formats::NV24,\n+\tlibcamera::formats::NV42,\n+\tlibcamera::formats::YUV420,\n+\tlibcamera::formats::YVU420\n+};\n+\n+ViewFinderGL::ViewFinderGL(QWidget *parent)\n+\t: QOpenGLWidget(parent),\n+\t buffer_(nullptr),\n+\t pFShader_(nullptr),\n+\t pVShader_(nullptr),\n+\t vbuf_(QOpenGLBuffer::VertexBuffer),\n+\t yuvDataPtr_(nullptr),\n+\t textureU_(QOpenGLTexture::Target2D),\n+\t textureV_(QOpenGLTexture::Target2D),\n+\t textureY_(QOpenGLTexture::Target2D)\n+{\n+}\n+\n+ViewFinderGL::~ViewFinderGL()\n+{\n+\tremoveShader();\n+\n+\tif (textureY_.isCreated())\n+\t\ttextureY_.destroy();\n+\n+\tif (textureU_.isCreated())\n+\t\ttextureU_.destroy();\n+\n+\tif (textureV_.isCreated())\n+\t\ttextureV_.destroy();\n+\n+\tvbuf_.destroy();\n+}\n+\n+const QList<libcamera::PixelFormat> &ViewFinderGL::nativeFormats() const\n+{\n+\treturn (::supportFormats);\n+}\n+\n+int ViewFinderGL::setFormat(const libcamera::PixelFormat &format,\n+\t\t\t const QSize &size)\n+{\n+\tint ret = 0;\n+\n+\tif (isFormatSupport(format)) {\n+\t\tformat_ = format;\n+\t\tsize_ = size;\n+\t} else {\n+\t\tret = -1;\n+\t}\n+\tupdateGeometry();\n+\treturn ret;\n+}\n+\n+void ViewFinderGL::stop()\n+{\n+\tif (buffer_) {\n+\t\trenderComplete(buffer_);\n+\t\tbuffer_ = nullptr;\n+\t}\n+}\n+\n+QImage ViewFinderGL::getCurrentImage()\n+{\n+\tQMutexLocker locker(&mutex_);\n+\n+\treturn (grabFramebuffer());\n+}\n+\n+void ViewFinderGL::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)\n+{\n+\tif (buffer->planes().size() != 1) {\n+\t\tqWarning() << \"Multi-planar buffers are not supported\";\n+\t\treturn;\n+\t}\n+\n+\tif (buffer_)\n+\t\trenderComplete(buffer_);\n+\n+\tunsigned char *memory = static_cast<unsigned char *>(map->memory);\n+\tif (memory) {\n+\t\tyuvDataPtr_ = memory;\n+\t\tupdate();\n+\t\tbuffer_ = buffer;\n+\t}\n+}\n+\n+bool ViewFinderGL::isFormatSupport(const libcamera::PixelFormat &format)\n+{\n+\tbool ret = true;\n+\tswitch (format) {\n+\tcase libcamera::formats::NV12:\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 2;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_2_planes_UV_f.glsl\";\n+\t\tbreak;\n+\tcase libcamera::formats::NV21:\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 2;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_2_planes_VU_f.glsl\";\n+\t\tbreak;\n+\tcase libcamera::formats::NV16:\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 1;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_2_planes_UV_f.glsl\";\n+\t\tbreak;\n+\tcase libcamera::formats::NV61:\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 1;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_2_planes_VU_f.glsl\";\n+\t\tbreak;\n+\tcase libcamera::formats::NV24:\n+\t\thorzSubSample_ = 1;\n+\t\tvertSubSample_ = 1;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_2_planes_UV_f.glsl\";\n+\t\tbreak;\n+\tcase libcamera::formats::NV42:\n+\t\thorzSubSample_ = 1;\n+\t\tvertSubSample_ = 1;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_2_planes_VU_f.glsl\";\n+\t\tbreak;\n+\tcase libcamera::formats::YUV420:\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 2;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_3_planes_UV_f.glsl\";\n+\t\tbreak;\n+\tcase libcamera::formats::YVU420:\n+\t\thorzSubSample_ = 2;\n+\t\tvertSubSample_ = 2;\n+\t\tvsrc_ = \":NV_vertex_shader.glsl\";\n+\t\tfsrc_ = \":NV_3_planes_VU_f.glsl\";\n+\t\tbreak;\n+\tdefault:\n+\t\tret = false;\n+\t\tqWarning() << \"[ViewFinderGL]:\"\n+\t\t\t << \"format not support yet.\";\n+\t\tbreak;\n+\t};\n+\n+\treturn ret;\n+}\n+\n+void ViewFinderGL::createVertexShader()\n+{\n+\tbool bCompile;\n+\t/* Create Vertex Shader */\n+\tpVShader_ = new QOpenGLShader(QOpenGLShader::Vertex, this);\n+\n+\tbCompile = pVShader_->compileSourceFile(vsrc_);\n+\tif (!bCompile) {\n+\t\tqWarning() << \"[ViewFinderGL]:\" << pVShader_->log();\n+\t}\n+\n+\tshaderProgram_.addShader(pVShader_);\n+}\n+\n+bool ViewFinderGL::createFragmentShader()\n+{\n+\tbool bCompile;\n+\n+\t/* Create Fragment Shader */\n+\tpFShader_ = new QOpenGLShader(QOpenGLShader::Fragment, this);\n+\n+\tbCompile = pFShader_->compileSourceFile(fsrc_);\n+\tif (!bCompile) {\n+\t\tqWarning() << \"[ViewFinderGL]:\" << pFShader_->log();\n+\t\treturn bCompile;\n+\t}\n+\n+\tshaderProgram_.addShader(pFShader_);\n+\n+\t/* Link shader pipeline */\n+\tif (!shaderProgram_.link()) {\n+\t\tqWarning() << \"[ViewFinderGL]:\" << shaderProgram_.log();\n+\t\tclose();\n+\t}\n+\n+\t/* Bind shader pipeline for use */\n+\tif (!shaderProgram_.bind()) {\n+\t\tqWarning() << \"[ViewFinderGL]:\" << shaderProgram_.log();\n+\t\tclose();\n+\t}\n+\n+\tshaderProgram_.enableAttributeArray(ATTRIB_VERTEX);\n+\tshaderProgram_.enableAttributeArray(ATTRIB_TEXTURE);\n+\n+\tshaderProgram_.setAttributeBuffer(ATTRIB_VERTEX,\n+\t\t\t\t\t GL_FLOAT,\n+\t\t\t\t\t 0,\n+\t\t\t\t\t 2,\n+\t\t\t\t\t 2 * sizeof(GLfloat));\n+\tshaderProgram_.setAttributeBuffer(ATTRIB_TEXTURE,\n+\t\t\t\t\t GL_FLOAT,\n+\t\t\t\t\t 8 * sizeof(GLfloat),\n+\t\t\t\t\t 2,\n+\t\t\t\t\t 2 * sizeof(GLfloat));\n+\n+\ttextureUniformY_ = shaderProgram_.uniformLocation(\"tex_y\");\n+\ttextureUniformU_ = shaderProgram_.uniformLocation(\"tex_u\");\n+\ttextureUniformV_ = shaderProgram_.uniformLocation(\"tex_v\");\n+\n+\tif (!textureY_.isCreated())\n+\t\ttextureY_.create();\n+\n+\tif (!textureU_.isCreated())\n+\t\ttextureU_.create();\n+\n+\tif (!textureV_.isCreated())\n+\t\ttextureV_.create();\n+\n+\tid_y_ = textureY_.textureId();\n+\tid_u_ = textureU_.textureId();\n+\tid_v_ = textureV_.textureId();\n+\treturn true;\n+}\n+\n+void ViewFinderGL::configureTexture(unsigned int id)\n+{\n+\tglBindTexture(GL_TEXTURE_2D, id);\n+\tglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);\n+\tglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);\n+\tglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);\n+\tglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);\n+}\n+\n+void ViewFinderGL::removeShader()\n+{\n+\tif (shaderProgram_.isLinked()) {\n+\t\tshaderProgram_.release();\n+\t\tshaderProgram_.removeAllShaders();\n+\t}\n+\n+\tif (pFShader_)\n+\t\tdelete pFShader_;\n+\n+\tif (pVShader_)\n+\t\tdelete pVShader_;\n+}\n+\n+void ViewFinderGL::initializeGL()\n+{\n+\tinitializeOpenGLFunctions();\n+\tglEnable(GL_TEXTURE_2D);\n+\tglDisable(GL_DEPTH_TEST);\n+\n+\tstatic const GLfloat vertices[]{\n+\t\t-1.0f, -1.0f, -1.0f, +1.0f,\n+\t\t+1.0f, +1.0f, +1.0f, -1.0f,\n+\t\t0.0f, 1.0f, 0.0f, 0.0f,\n+\t\t1.0f, 0.0f, 1.0f, 1.0f\n+\t};\n+\n+\tvbuf_.create();\n+\tvbuf_.bind();\n+\tvbuf_.allocate(vertices, sizeof(vertices));\n+\n+\t/* Create Vertex Shader */\n+\tcreateVertexShader();\n+\n+\tglClearColor(1.0f, 1.0f, 1.0f, 0.0f);\n+}\n+\n+void ViewFinderGL::doRender()\n+{\n+\tswitch (format_) {\n+\tcase libcamera::formats::NV12:\n+\tcase libcamera::formats::NV21:\n+\tcase libcamera::formats::NV16:\n+\tcase libcamera::formats::NV61:\n+\tcase libcamera::formats::NV24:\n+\tcase libcamera::formats::NV42:\n+\t\t/* activate texture 0 */\n+\t\tglActiveTexture(GL_TEXTURE0);\n+\t\tconfigureTexture(id_y_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t size_.width(),\n+\t\t\t size_.height(),\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t yuvDataPtr_);\n+\t\tglUniform1i(textureUniformY_, 0);\n+\n+\t\t/* activate texture 1 */\n+\t\tglActiveTexture(GL_TEXTURE1);\n+\t\tconfigureTexture(id_u_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RG,\n+\t\t\t size_.width() / horzSubSample_,\n+\t\t\t size_.height() / vertSubSample_,\n+\t\t\t 0,\n+\t\t\t GL_RG,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t (char *)yuvDataPtr_ + size_.width() * size_.height());\n+\t\tglUniform1i(textureUniformU_, 1);\n+\t\tbreak;\n+\tcase libcamera::formats::YUV420:\n+\t\t/* activate texture 0 */\n+\t\tglActiveTexture(GL_TEXTURE0);\n+\t\tconfigureTexture(id_y_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t size_.width(),\n+\t\t\t size_.height(),\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t yuvDataPtr_);\n+\t\tglUniform1i(textureUniformY_, 0);\n+\n+\t\t/* activate texture 1 */\n+\t\tglActiveTexture(GL_TEXTURE1);\n+\t\tconfigureTexture(id_u_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t size_.width() / horzSubSample_,\n+\t\t\t size_.height() / vertSubSample_,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t (char *)yuvDataPtr_ + size_.width() * size_.height());\n+\t\tglUniform1i(textureUniformU_, 1);\n+\n+\t\t/* activate texture 2 */\n+\t\tglActiveTexture(GL_TEXTURE2);\n+\t\tconfigureTexture(id_v_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t size_.width() / horzSubSample_,\n+\t\t\t size_.height() / vertSubSample_,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t (char *)yuvDataPtr_ + size_.width() * size_.height() * 5 / 4);\n+\t\tglUniform1i(textureUniformV_, 2);\n+\t\tbreak;\n+\tcase libcamera::formats::YVU420:\n+\t\t/* activate texture 0 */\n+\t\tglActiveTexture(GL_TEXTURE0);\n+\t\tconfigureTexture(id_y_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t size_.width(),\n+\t\t\t size_.height(),\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t yuvDataPtr_);\n+\t\tglUniform1i(textureUniformY_, 0);\n+\n+\t\t/* activate texture 1 */\n+\t\tglActiveTexture(GL_TEXTURE2);\n+\t\tconfigureTexture(id_v_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t size_.width() / horzSubSample_,\n+\t\t\t size_.height() / vertSubSample_,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t (char *)yuvDataPtr_ + size_.width() * size_.height());\n+\t\tglUniform1i(textureUniformV_, 1);\n+\n+\t\t/* activate texture 2 */\n+\t\tglActiveTexture(GL_TEXTURE1);\n+\t\tconfigureTexture(id_u_);\n+\t\tglTexImage2D(GL_TEXTURE_2D,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t size_.width() / horzSubSample_,\n+\t\t\t size_.height() / vertSubSample_,\n+\t\t\t 0,\n+\t\t\t GL_RED,\n+\t\t\t GL_UNSIGNED_BYTE,\n+\t\t\t (char *)yuvDataPtr_ + size_.width() * size_.height() * 5 / 4);\n+\t\tglUniform1i(textureUniformU_, 2);\n+\tdefault:\n+\t\tbreak;\n+\t};\n+}\n+\n+void ViewFinderGL::paintGL()\n+{\n+\tif (pFShader_ == nullptr)\n+\t\tcreateFragmentShader();\n+\n+\tif (yuvDataPtr_) {\n+\t\tglClearColor(0.0, 0.0, 0.0, 1.0);\n+\t\tglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\n+\n+\t\tdoRender();\n+\t\tglDrawArrays(GL_TRIANGLE_FAN, 0, 4);\n+\t}\n+}\n+\n+void ViewFinderGL::resizeGL(int w, int h)\n+{\n+\tglViewport(0, 0, w, h);\n+}\n+\n+QSize ViewFinderGL::sizeHint() const\n+{\n+\treturn size_.isValid() ? size_ : QSize(640, 480);\n+}\ndiff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\nnew file mode 100644\nindex 0000000..e708c32\n--- /dev/null\n+++ b/src/qcam/viewfinder_gl.h\n@@ -0,0 +1,97 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * viewfinder_GL.h - OpenGL Viewfinder for rendering by OpenGL shader\n+ *\n+ */\n+#ifndef __VIEWFINDER_GL_H__\n+#define __VIEWFINDER_GL_H__\n+\n+#include <QImage>\n+#include <QMutex>\n+#include <QObject>\n+#include <QOpenGLBuffer>\n+#include <QOpenGLFunctions>\n+#include <QOpenGLShader>\n+#include <QOpenGLShaderProgram>\n+#include <QOpenGLTexture>\n+#include <QOpenGLWidget>\n+#include <QSize>\n+\n+#include <libcamera/buffer.h>\n+#include <libcamera/formats.h>\n+#include \"viewfinder.h\"\n+\n+class ViewFinderGL : public QOpenGLWidget,\n+\t\t public ViewFinder,\n+\t\t protected QOpenGLFunctions\n+{\n+\tQ_OBJECT\n+\n+public:\n+\tViewFinderGL(QWidget *parent = 0);\n+\t~ViewFinderGL();\n+\n+\tconst QList<libcamera::PixelFormat> &nativeFormats() const override;\n+\n+\tint setFormat(const libcamera::PixelFormat &format, const QSize &size) override;\n+\tvoid render(libcamera::FrameBuffer *buffer, MappedBuffer *map) override;\n+\tvoid stop() override;\n+\n+\tQImage getCurrentImage() override;\n+\n+Q_SIGNALS:\n+\tvoid renderComplete(libcamera::FrameBuffer *buffer);\n+\n+protected:\n+\tvoid initializeGL() override;\n+\tvoid paintGL() override;\n+\tvoid resizeGL(int w, int h) override;\n+\tQSize sizeHint() const override;\n+\n+private:\n+\tbool isFormatSupport(const libcamera::PixelFormat &format);\n+\n+\tvoid configureTexture(unsigned int id);\n+\tbool createFragmentShader();\n+\tvoid createVertexShader();\n+\tvoid removeShader();\n+\tvoid doRender();\n+\n+\t/* Captured image size, format and buffer */\n+\tlibcamera::FrameBuffer *buffer_;\n+\tlibcamera::PixelFormat format_;\n+\tQSize size_;\n+\n+\t/* OpenGL components for render */\n+\tQOpenGLShader *pFShader_;\n+\tQOpenGLShader *pVShader_;\n+\tQOpenGLShaderProgram shaderProgram_;\n+\n+\t/* Vertex buffer */\n+\tQOpenGLBuffer vbuf_;\n+\n+\t/* Fragment and Vertex shader file name */\n+\tQString fsrc_;\n+\tQString vsrc_;\n+\n+\tunsigned char *yuvDataPtr_;\n+\n+\t/* YUV texture planars and parameters */\n+\tGLuint id_u_;\n+\tGLuint id_v_;\n+\tGLuint id_y_;\n+\tGLuint textureUniformU_;\n+\tGLuint textureUniformV_;\n+\tGLuint textureUniformY_;\n+\tQOpenGLTexture textureU_;\n+\tQOpenGLTexture textureV_;\n+\tQOpenGLTexture textureY_;\n+\tunsigned int horzSubSample_;\n+\tunsigned int vertSubSample_;\n+\n+\tQImage image_;\n+\tQMutex mutex_; /* Prevent concurrent access to image_ */\n+};\n+#endif /* __VIEWFINDER_GL_H__ */\n", "prefixes": [ "libcamera-devel", "v5", "3/4" ] }