Patch Detail
Show a patch.
GET /api/1.1/patches/3222/?format=api
{ "id": 3222, "url": "https://patchwork.libcamera.org/api/1.1/patches/3222/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3222/", "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-3-show.liu@linaro.org>", "date": "2020-03-20T08:50:28", "name": "[libcamera-devel,RFC,2/3] Added opengl widget class for qcam", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "96ba5c1d7b9f2b74b00fbc866a8578e11368bc86", "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/3222/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/3222/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3222/checks/", "tags": {}, "headers": { "Return-Path": "<show.liu@linaro.org>", "Received": [ "from mail-pg1-x532.google.com (mail-pg1-x532.google.com\n\t[IPv6:2607:f8b0:4864:20::532])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 97D7B6041A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 Mar 2020 09:59:16 +0100 (CET)", "by mail-pg1-x532.google.com with SMTP id 7so2766717pgr.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 Mar 2020 01:59:16 -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.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 20 Mar 2020 01:59:14 -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=rfRhXpmVt8wkY3YTvk5qVRhqAyjmzIIu39qdhS0GYd8=;\n\tb=vYLT4vU+5ot9yvUb+YTanF6lhMaAfOx5+HUg9ZZjDR//lFmCK0eGXwqGOsTlUSuGtt\n\t//dwErJGAv4RVkeWxbSG11b7rHM5JTrUcgMKHs5ED03tjsVjt4CMNbtTlidFoQL9pA9i\n\tyAm3HAC6+U/NgpMkyF0bjJLLdgOe9JMjGr4QGimuvdt85+jG7hRCCfM6SDsVKbZOzwTj\n\t00tXSpop/uPtESGCRTK19sLptJC/N+G6uV6XKNxttYzuzQan7iMd97McdviW+UnwAWK3\n\t6VcdVy3h380Csc58bsRHsM3xYMi0DSKlXxsLorU8vMMacyRju76tnGG7U0c8hecYU2uB\n\tFTlQ==", "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=rfRhXpmVt8wkY3YTvk5qVRhqAyjmzIIu39qdhS0GYd8=;\n\tb=bMk1/7iytvJqRSoyc0OOi3cpoxN1rj2G3JOs2esFQKHlHz0zcbbOEO5Y/Kvmhs6k/A\n\tEy2aqrtcda0quWujJqXjcOhmuaiy3zVSXlT8wYVJ1Khb53n3ricJkdVSOgIz+BBYElJM\n\t952oTJXAjT+M+oJL4OnhClC+22ZWrOhOzwW7edz5BldcbFRiMod7F3TYfFBoR/f8Eecc\n\t5moCm5gFReLgtmoltWLQzfwJBs47tShX9Lcfpv+bL6FPxtVssjX+DbbuQE17hRJS72W8\n\tImxlgxP1op07V6BoP1wCqqHz7a8e6ENgRAXt0JoHAx/QUZZ//F2qHPBN19oxWNyknvtk\n\tamLw==", "X-Gm-Message-State": "ANhLgQ2DW+Ot1qbsrlkhXYClvVRFFm4jlHWaXUB52muaSy1STiKI+kz6\n\t8V06+BTdRGRN3oYt1hP6c38Pj+orZ+Twfg==", "X-Google-Smtp-Source": "ADFU+vvbJLJPjgd6XEdSTZ33mGsizv9RzMeJ+bd/JJ8AYSkPhIUOUH7B2kYnyQXXKB5BbJpA4ZrdUw==", "X-Received": "by 2002:a63:6203:: with SMTP id w3mr7830308pgb.35.1584694754727; \n\tFri, 20 Mar 2020 01:59:14 -0700 (PDT)", "From": "Show Liu <show.liu@linaro.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 20 Mar 2020 16:50:28 +0800", "Message-Id": "<20200320085029.17875-3-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 2/3] Added opengl widget class for\n\tqcam", "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:16 -0000" }, "content": "qcam: Added opengl widget class for qcam\n\nSigned-off-by: Show Liu <show.liu@linaro.org>\n---\n src/qcam/glwidget.cpp | 213 ++++++++++++++++++++++++++++++++++++++++++\n src/qcam/glwidget.h | 76 +++++++++++++++\n src/qcam/meson.build | 4 +-\n 3 files changed, 292 insertions(+), 1 deletion(-)\n create mode 100644 src/qcam/glwidget.cpp\n create mode 100644 src/qcam/glwidget.h", "diff": "diff --git a/src/qcam/glwidget.cpp b/src/qcam/glwidget.cpp\nnew file mode 100644\nindex 0000000..bf6add4\n--- /dev/null\n+++ b/src/qcam/glwidget.cpp\n@@ -0,0 +1,213 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * glwidget.cpp - Rendering YUV frame by OpenGL shader\n+ */\n+\n+#include \"glwidget.h\"\n+#include <QImage>\n+\n+#define ATTRIB_VERTEX 0\n+#define ATTRIB_TEXTURE 1\n+\n+GLWidget::GLWidget(QWidget *parent)\n+\t: QOpenGLWidget(parent),\n+\ttextureY(QOpenGLTexture::Target2D),\n+\ttextureU(QOpenGLTexture::Target2D),\n+\ttextureV(QOpenGLTexture::Target2D),\n+\tyuvDataPtr(NULL),\n+\tglBuffer(QOpenGLBuffer::VertexBuffer)\n+{\n+}\n+\n+GLWidget::~GLWidget()\n+{\n+\tremoveShader();\n+\n+\ttextureY.destroy();\n+\ttextureU.destroy();\n+\ttextureV.destroy();\n+\n+\tglBuffer.destroy();\n+}\n+\n+void GLWidget::updateFrame(unsigned char *buffer)\n+{\n+\tif(buffer) {\n+\t\tyuvDataPtr = buffer;\n+\t\tupdate();\n+\t}\n+}\n+\n+void GLWidget::setFrameSize(int width, int height)\n+{\n+\tif(width > 0 && height > 0) {\n+\t\twidth_ = width;\n+\t\theight_ = height;\n+\t}\n+}\n+\n+int GLWidget::configure(unsigned int format, unsigned int width,\n+\t\t\t\t\t\tunsigned int height)\n+{\n+\tswitch (format) {\n+\tcase DRM_FORMAT_NV12:\n+\tbreak;\n+\tcase DRM_FORMAT_NV21:\n+\tbreak;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t};\n+\tformat_ = format;\n+\twidth_ = width;\n+\theight_ = height;\n+\n+\treturn 0;\n+}\n+\n+void GLWidget::createShader()\n+{\n+\tbool ret = false;\n+\n+\tQString vsrc = \"attribute vec4 vertexIn; \\n\"\n+\t\t\t\t\t\"attribute vec2 textureIn; \\n\"\n+\t\t\t\t\t\"varying vec2 textureOut; \\n\"\n+\t\t\t\t\t\"void main(void) \\n\"\n+\t\t\t\t\t\"{ \\n\"\n+\t\t\t\t\t\t\"gl_Position = vertexIn; \\n\"\n+\t\t\t\t\t\t\"textureOut = textureIn; \\n\"\n+\t\t\t\t\t\"} \\n\";\n+\n+\tret = shaderProgram.addShaderFromSourceCode(QOpenGLShader::Vertex, vsrc);\n+\tif(!ret) {\n+\t\tqDebug() << __func__ << \":\" << shaderProgram.log();\n+\t}\n+\n+\tQString fsrc = \"#ifdef GL_ES \\n\"\n+\t\t\t\t\t\"precision highp float; \\n\"\n+\t\t\t\t\t\"#endif \\n\"\n+\t\t\t\t\t\"varying vec2 textureOut; \\n\"\n+\t\t\t\t\t\"uniform sampler2D tex_y; \\n\"\n+\t\t\t\t\t\"uniform sampler2D tex_uv; \\n\"\n+\t\t\t\t\t\"void main(void) \\n\"\n+\t\t\t\t\t\"{ \\n\"\n+\t\t\t\t\t\"vec3 yuv; \\n\"\n+\t\t\t\t\t\"vec3 rgb; \\n\"\n+\t\t\t\t\t\"yuv.x = texture2D(tex_y, textureOut).r - 0.0625; \\n\"\n+\t\t\t\t\t\"yuv.y = texture2D(tex_uv, textureOut).r - 0.5; \\n\"\n+\t\t\t\t\t\"yuv.z = texture2D(tex_uv, textureOut).g - 0.5; \\n\"\n+\t\t\t\t\t\"rgb = mat3( 1.0, 1.0, 1.0, \\n\"\n+\t\t\t\t\t \" 0.0, -0.39465, 2.03211, \\n\"\n+\t\t\t\t\t \" 1.13983, -0.58060, 0.0) * yuv; \\n\"\n+\t\t\t\t\t\"gl_FragColor = vec4(rgb, 1.0); \\n\"\n+\t\t\t\t\t\"}\\n\";\n+\tret = shaderProgram.addShaderFromSourceCode(QOpenGLShader::Fragment, fsrc);\n+\tif(!ret) {\n+\t\tqDebug() << __func__ << \":\" << shaderProgram.log();\n+\t}\n+\n+\t// Link shader pipeline\n+\tif (!shaderProgram.link()) {\n+\t\tqDebug() << __func__ << \": shader program link failed.\\n\" << shaderProgram.log();\n+\t\tclose();\n+\t}\n+\n+\t// Bind shader pipeline for use\n+\tif (!shaderProgram.bind()) {\n+\t\tqDebug() << __func__ << \": shader program binding failed.\\n\" << shaderProgram.log();\n+\t\tclose();\n+\t}\n+\n+}\n+\n+void GLWidget::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 GLWidget::removeShader()\n+{\n+\tif (shaderProgram.isLinked()) {\n+\t\tshaderProgram.release();\n+\t\tshaderProgram.removeAllShaders();\n+\t}\n+}\n+\n+void GLWidget::initializeGL()\n+{\n+\tinitializeOpenGLFunctions();\n+\n+\n+\tglEnable(GL_TEXTURE_2D);\n+\tglDisable(GL_DEPTH_TEST);\n+\n+\tstatic const GLfloat vertices[] {\n+\t\t-1.0f,-1.0f,\n+\t\t-1.0f,+1.0f,\n+\t\t+1.0f,+1.0f,\n+\t\t+1.0f,-1.0f,\n+\t\t0.0f,1.0f,\n+\t\t0.0f,0.0f,\n+\t\t1.0f,0.0f,\n+\t\t1.0f,1.0f,\n+\t};\n+\n+\tglBuffer.create();\n+\tglBuffer.bind();\n+\tglBuffer.allocate(vertices,sizeof(vertices));\n+\n+\tcreateShader();\n+\n+\tshaderProgram.enableAttributeArray(ATTRIB_VERTEX);\n+\tshaderProgram.enableAttributeArray(ATTRIB_TEXTURE);\n+\n+\tshaderProgram.setAttributeBuffer(ATTRIB_VERTEX,GL_FLOAT,0,2,2*sizeof(GLfloat));\n+\tshaderProgram.setAttributeBuffer(ATTRIB_TEXTURE,GL_FLOAT,8*sizeof(GLfloat),2,2*sizeof(GLfloat));\n+\n+\ttextureUniformY = shaderProgram.uniformLocation(\"tex_y\");\n+\ttextureUniformU = shaderProgram.uniformLocation(\"tex_uv\");\n+\n+\ttextureY.create();\n+\ttextureU.create();\n+\n+\tid_y = textureY.textureId();\n+\tid_u = textureU.textureId();\n+\n+\tconfigureTexture(id_y);\n+\tconfigureTexture(id_u);\n+\n+\tglClearColor(1.0f, 1.0f, 1.0f, 0.0f);\n+}\n+\n+void GLWidget::paintGL()\n+{\n+\tif(yuvDataPtr)\n+\t{\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\t// activate texture Y\n+\t\tglActiveTexture(GL_TEXTURE0);\n+\t\tglBindTexture(GL_TEXTURE_2D, id_y);\n+\t\tglTexImage2D(GL_TEXTURE_2D, 0, GL_RED, width_, height_, 0, GL_RED, GL_UNSIGNED_BYTE, yuvDataPtr);\n+\t\tglUniform1i(textureUniformY, 0);\n+\n+\t\t// activate texture UV\n+\t\tglActiveTexture(GL_TEXTURE1);\n+\t\tglBindTexture(GL_TEXTURE_2D, id_u);\n+\t\tglTexImage2D(GL_TEXTURE_2D, 0, GL_RG, width_/2, height_/2, 0, GL_RG, GL_UNSIGNED_BYTE, (char*)yuvDataPtr+width_*height_);\n+\t\tglUniform1i(textureUniformU, 1);\n+\n+\t\tglDrawArrays(GL_TRIANGLE_FAN, 0, 4);\n+\t}\n+}\n+\n+void GLWidget::resizeGL(int w, int h)\n+{\n+\tglViewport(0,0,w,h);\n+}\ndiff --git a/src/qcam/glwidget.h b/src/qcam/glwidget.h\nnew file mode 100644\nindex 0000000..17f71b9\n--- /dev/null\n+++ b/src/qcam/glwidget.h\n@@ -0,0 +1,76 @@\n+#ifndef GLWINDOW_H\n+#define GLWINDOW_H\n+\n+#include <fcntl.h>\n+#include <iomanip>\n+#include <iostream>\n+#include <sstream>\n+#include <string.h>\n+#include <unistd.h>\n+\n+#include <QOpenGLWidget>\n+#include <QOpenGLFunctions>\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * glwidget.h - Rendering YUV frame by OpenGL shader\n+ */\n+#include <QOpenGLTexture>\n+#include <QOpenGLShader>\n+#include <QOpenGLShaderProgram>\n+\n+#include <QOpenGLBuffer>\n+#include <QImage>\n+\n+#include <linux/drm_fourcc.h>\n+\n+class GLWidget : public QOpenGLWidget, protected QOpenGLFunctions\n+{\n+\tQ_OBJECT\n+\n+public:\n+\tGLWidget(QWidget *parent = 0);\n+\t~GLWidget();\n+\n+\tvoid setFrameSize(int width, int height);\n+\tvoid updateFrame(unsigned char *buffer);\n+\n+\tint configure(unsigned int format, unsigned int width,\n+\t\t\t\t\tunsigned int height);\n+\n+\tvoid createShader();\n+\n+protected:\n+\tvoid initializeGL() Q_DECL_OVERRIDE;\n+\tvoid paintGL() Q_DECL_OVERRIDE;\n+\tvoid resizeGL(int w, int h) Q_DECL_OVERRIDE;\n+\n+private:\n+\n+\tvoid configureTexture(unsigned int id);\n+\tvoid removeShader();\n+\n+\tQOpenGLShader *pVShader;\n+\tQOpenGLShader *pFShader;\n+\tQOpenGLShaderProgram shaderProgram;\n+\n+\tGLuint textureUniformY;\n+\tGLuint textureUniformU;\n+\tGLuint textureUniformV;\n+\tGLuint id_y;\n+\tGLuint id_u;\n+\tGLuint id_v;\n+\tQOpenGLTexture textureY;\n+\tQOpenGLTexture textureU;\n+\tQOpenGLTexture textureV;\n+\n+\tunsigned int format_;\n+\tunsigned int width_;\n+\tunsigned int height_;\n+\n+\tunsigned char* yuvDataPtr;\n+\n+\tQOpenGLBuffer glBuffer;\n+};\n+#endif // GLWINDOW_H\ndiff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex 5150631..8bbcfba 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -5,10 +5,12 @@ qcam_sources = files([\n '../cam/options.cpp',\n 'qt_event_dispatcher.cpp',\n 'viewfinder.cpp',\n+ 'glwidget.cpp'\n ])\n \n qcam_moc_headers = files([\n 'main_window.h',\n+ 'glwidget.h'\n ])\n \n qcam_resources = files([\n@@ -18,7 +20,7 @@ qcam_resources = files([\n qt5 = import('qt5')\n qt5_dep = dependency('qt5',\n method : 'pkg-config',\n- modules : ['Core', 'Gui', 'Widgets'],\n+ modules : ['Core', 'Gui', 'Widgets','OpenGL', 'OpenGLExtensions'],\n required : false)\n \n if qt5_dep.found()\n", "prefixes": [ "libcamera-devel", "RFC", "2/3" ] }