Patch Detail
Show a patch.
GET /api/patches/9568/?format=api
{ "id": 9568, "url": "https://patchwork.libcamera.org/api/patches/9568/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9568/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20200911085514.30021-2-show.liu@linaro.org>", "date": "2020-09-11T08:55:11", "name": "[libcamera-devel,v6,1/4] qcam: add OpenGL shader code as Qt resource", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1dbca9380c5f083b042a1439b976c978e8baec7b", "submitter": { "id": 24, "url": "https://patchwork.libcamera.org/api/people/24/?format=api", "name": "Show Liu", "email": "show.liu@linaro.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9568/mbox/", "series": [ { "id": 1284, "url": "https://patchwork.libcamera.org/api/series/1284/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1284", "date": "2020-09-11T08:55:10", "name": "qcam: accelerate format conversion by OpenGL shader", "version": 6, "mbox": "https://patchwork.libcamera.org/series/1284/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9568/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9568/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 15C54BDB1D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 11 Sep 2020 08:55:44 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D5B0E62D53;\n\tFri, 11 Sep 2020 10:55:43 +0200 (CEST)", "from mail-pg1-x541.google.com (mail-pg1-x541.google.com\n\t[IPv6:2607:f8b0:4864:20::541])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A2F8A62C8C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 11 Sep 2020 10:55:41 +0200 (CEST)", "by mail-pg1-x541.google.com with SMTP id 34so6145363pgo.13\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 11 Sep 2020 01:55:41 -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\tw192sm1616543pfd.156.2020.09.11.01.55.38\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 11 Sep 2020 01:55:39 -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=\"IRuM0hsA\"; 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=0omJwhTWOXd4elXOuaIzrGc5lHhq8k1FeAGhy5jES0A=;\n\tb=IRuM0hsAeZccZaszJ+Hfd9PFwaJhmrNDg9JbNqk6/i4nXubJ9Ntfr1aM/6ETqFWnK9\n\tXewMQ5pb+r73WmtAZr4TcrwJ8td953fsb7iVi3RticoUYnHlYM8A4itjble1z3x5Y1JX\n\tTPQApnqardcsWFTjpuvWbm5lkwz51dK1JpEG8XnYWcyHDRxg0ns9GqwhTmeThsnaPlqm\n\tEeDqWM4R6UTwA1chJIJgxMQxhlhdk/4m9YSxQHUkqXj4XlPndJQ0BQzmG04kgWiiupxU\n\tzIgc/N6b4PepJWIWRlo2yFpQsCxs/g0wn5be2lqtXyuzOAljx5zcateqT66RleCGT82D\n\tL5HQ==", "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=0omJwhTWOXd4elXOuaIzrGc5lHhq8k1FeAGhy5jES0A=;\n\tb=CpfVDWg975e/6Z5NBxIes0eEtXRmiKxYMf4OoerXKCe3is2E4Z10J9vBbxSA+EAUZ8\n\txkMMDiX1QJriPjs9mvM42wQDJvzul9PwBuuzLHbY6AYBvh9hmXgyGtX09ofyOt2Q/CmJ\n\tJSoVSdmjWmYeOWUz8Xe7ihaWksD7lsfzxLy72isJXWCSuZy7rYA4BUnIq1eiSGLYoZaf\n\tyL9/ytVnUigmhVGG9lH37bpHLdYLwAszZvDLO74Msn6bOoviaGIcppVBUjGJ3ARdy6+w\n\tKsphewL8nmo0GEPMhzNRnc3zWlFk4iKmISwgoZ8op70QMzz7Lqsj1+aoanRMwMlKJ8fI\n\tYM3w==", "X-Gm-Message-State": "AOAM53329a1aAERBim/IPrZJG2bEE+0Kc9NIoGFyr12ILxKqmdCqnEhJ\n\ta3n/QeaoawhaYtrX83vA6NDAXiNk3BlFag==", "X-Google-Smtp-Source": "ABdhPJwc0lLO2qV4zQqkbIqXFGZ8MMbKlMPBT13P/t3auI6DvyFKn9h9XeDXiIA7VweLhZOxj+fQXQ==", "X-Received": "by 2002:a62:7c82:0:b029:13c:1611:6532 with SMTP id\n\tx124-20020a627c820000b029013c16116532mr1278583pfc.4.1599814539831; \n\tFri, 11 Sep 2020 01:55:39 -0700 (PDT)", "From": "Show Liu <show.liu@linaro.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 11 Sep 2020 16:55:11 +0800", "Message-Id": "<20200911085514.30021-2-show.liu@linaro.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200911085514.30021-1-show.liu@linaro.org>", "References": "<20200911085514.30021-1-show.liu@linaro.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v6 1/4] qcam: add OpenGL shader code as Qt\n\tresource", "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": "Add OpenGL fragment and vertex shaders to convert two- and tri-planar\nYUV formats to RGB. This will be used to accelerate YUV image rendering.\n\nSigned-off-by: Show Liu <show.liu@linaro.org>\n---\n src/qcam/assets/shader/NV_2_planes_UV_f.glsl | 32 +++++++++++++++++++\n src/qcam/assets/shader/NV_2_planes_VU_f.glsl | 32 +++++++++++++++++++\n src/qcam/assets/shader/NV_3_planes_f.glsl | 33 ++++++++++++++++++++\n src/qcam/assets/shader/NV_vertex_shader.glsl | 16 ++++++++++\n src/qcam/assets/shader/shaders.qrc | 9 ++++++\n src/qcam/meson.build | 1 +\n 6 files changed, 123 insertions(+)\n create mode 100644 src/qcam/assets/shader/NV_2_planes_UV_f.glsl\n create mode 100644 src/qcam/assets/shader/NV_2_planes_VU_f.glsl\n create mode 100644 src/qcam/assets/shader/NV_3_planes_f.glsl\n create mode 100644 src/qcam/assets/shader/NV_vertex_shader.glsl\n create mode 100644 src/qcam/assets/shader/shaders.qrc", "diff": "diff --git a/src/qcam/assets/shader/NV_2_planes_UV_f.glsl b/src/qcam/assets/shader/NV_2_planes_UV_f.glsl\nnew file mode 100644\nindex 0000000..80478c5\n--- /dev/null\n+++ b/src/qcam/assets/shader/NV_2_planes_UV_f.glsl\n@@ -0,0 +1,32 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * NV_2_planes_UV_f.glsl - Fragment shader code for NV12, NV16 and NV24 formats\n+ */\n+\n+#ifdef GL_ES\n+precision mediump float;\n+#endif\n+\n+varying vec2 textureOut;\n+uniform sampler2D tex_y;\n+uniform sampler2D tex_u;\n+\n+void main(void)\n+{\n+\tvec3 yuv;\n+\tvec3 rgb;\n+\tmat3 yuv2rgb_bt601_mat = mat3(\n+\t\t\t\t vec3(1.164, 1.164, 1.164),\n+\t\t\t\t vec3(0.000, -0.392, 2.017),\n+\t\t\t\t vec3(1.596, -0.813, 0.000)\n+\t\t\t\t );\n+\n+\tyuv.x = texture2D(tex_y, textureOut).r - 0.063;\n+\tyuv.y = texture2D(tex_u, textureOut).r - 0.500;\n+\tyuv.z = texture2D(tex_u, textureOut).g - 0.500;\n+\n+\trgb = yuv2rgb_bt601_mat * yuv;\n+\tgl_FragColor = vec4(rgb, 1.0);\n+}\ndiff --git a/src/qcam/assets/shader/NV_2_planes_VU_f.glsl b/src/qcam/assets/shader/NV_2_planes_VU_f.glsl\nnew file mode 100644\nindex 0000000..3794be8\n--- /dev/null\n+++ b/src/qcam/assets/shader/NV_2_planes_VU_f.glsl\n@@ -0,0 +1,32 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * NV_2_planes_VU_f.glsl - Fragment shader code for NV21, NV61 and NV42 formats\n+ */\n+\n+#ifdef GL_ES\n+precision mediump float;\n+#endif\n+\n+varying vec2 textureOut;\n+uniform sampler2D tex_y;\n+uniform sampler2D tex_u;\n+\n+void main(void)\n+{\n+\tvec3 yuv;\n+\tvec3 rgb;\n+\tmat3 yuv2rgb_bt601_mat = mat3(\n+\t\t\t\t vec3(1.164, 1.164, 1.164),\n+\t\t\t\t vec3(0.000, -0.392, 2.017),\n+\t\t\t\t vec3(1.596, -0.813, 0.000)\n+\t\t\t\t );\n+\n+\tyuv.x = texture2D(tex_y, textureOut).r - 0.063;\n+\tyuv.y = texture2D(tex_u, textureOut).g - 0.500;\n+\tyuv.z = texture2D(tex_u, textureOut).r - 0.500;\n+\n+\trgb = yuv2rgb_bt601_mat * yuv;\n+\tgl_FragColor = vec4(rgb, 1.0);\n+}\ndiff --git a/src/qcam/assets/shader/NV_3_planes_f.glsl b/src/qcam/assets/shader/NV_3_planes_f.glsl\nnew file mode 100644\nindex 0000000..fca9b65\n--- /dev/null\n+++ b/src/qcam/assets/shader/NV_3_planes_f.glsl\n@@ -0,0 +1,33 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * NV_3_planes_UV_f.glsl - Fragment shader code for YUV420 format\n+ */\n+\n+#ifdef GL_ES\n+precision mediump float;\n+#endif\n+\n+varying vec2 textureOut;\n+uniform sampler2D tex_y;\n+uniform sampler2D tex_u;\n+uniform sampler2D tex_v;\n+\n+void main(void)\n+{\n+\tvec3 yuv;\n+\tvec3 rgb;\n+\tmat3 yuv2rgb_bt601_mat = mat3(\n+\t\t\t\t vec3(1.164, 1.164, 1.164),\n+\t\t\t\t vec3(0.000, -0.392, 2.017),\n+\t\t\t\t vec3(1.596, -0.813, 0.000)\n+\t\t\t\t );\n+\n+\tyuv.x = texture2D(tex_y, textureOut).r - 0.063;\n+\tyuv.y = texture2D(tex_u, textureOut).r - 0.500;\n+\tyuv.z = texture2D(tex_v, textureOut).r - 0.500;\n+\n+\trgb = yuv2rgb_bt601_mat * yuv;\n+\tgl_FragColor = vec4(rgb, 1.0);\n+}\ndiff --git a/src/qcam/assets/shader/NV_vertex_shader.glsl b/src/qcam/assets/shader/NV_vertex_shader.glsl\nnew file mode 100644\nindex 0000000..12e791e\n--- /dev/null\n+++ b/src/qcam/assets/shader/NV_vertex_shader.glsl\n@@ -0,0 +1,16 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Linaro\n+ *\n+ * NV_vertex_shader.glsl - Vertex shader code for NV family\n+ */\n+\n+attribute vec4 vertexIn;\n+attribute vec2 textureIn;\n+varying vec2 textureOut;\n+\n+void main(void)\n+{\n+\tgl_Position = vertexIn;\n+\ttextureOut = textureIn;\n+}\ndiff --git a/src/qcam/assets/shader/shaders.qrc b/src/qcam/assets/shader/shaders.qrc\nnew file mode 100644\nindex 0000000..33eab27\n--- /dev/null\n+++ b/src/qcam/assets/shader/shaders.qrc\n@@ -0,0 +1,9 @@\n+<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->\n+<!DOCTYPE RCC><RCC version=\"1.0\">\n+<qresource>\n+<file>./NV_vertex_shader.glsl</file>\n+<file>./NV_2_planes_UV_f.glsl</file>\n+<file>./NV_2_planes_VU_f.glsl</file>\n+<file>./NV_3_planes_f.glsl</file>\n+</qresource>\n+</RCC>\ndiff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex 6ea886a..e0c6f26 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -16,6 +16,7 @@ qcam_moc_headers = files([\n \n qcam_resources = files([\n 'assets/feathericons/feathericons.qrc',\n+ 'assets/shader/shaders.qrc'\n ])\n \n qt5 = import('qt5')\n", "prefixes": [ "libcamera-devel", "v6", "1/4" ] }