Patch Detail
Show a patch.
GET /api/patches/9607/?format=api
{ "id": 9607, "url": "https://patchwork.libcamera.org/api/patches/9607/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9607/", "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": "<20200915024623.30667-2-laurent.pinchart@ideasonboard.com>", "date": "2020-09-15T02:46:20", "name": "[libcamera-devel,v7,1/4] qcam: Add OpenGL shader code as Qt resource", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ecf1b156733a89f6c2061ca2e15cafe4be612a28", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9607/mbox/", "series": [ { "id": 1290, "url": "https://patchwork.libcamera.org/api/series/1290/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1290", "date": "2020-09-15T02:46:19", "name": "[libcamera-devel,v7,1/4] qcam: Add OpenGL shader code as Qt resource", "version": 7, "mbox": "https://patchwork.libcamera.org/series/1290/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9607/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9607/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 DFC7DC3B5B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 15 Sep 2020 02:46:57 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D69D062E08;\n\tTue, 15 Sep 2020 04:46:56 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 591B462901\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 15 Sep 2020 04:46:55 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E5108276;\n\tTue, 15 Sep 2020 04:46:54 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"RH+9Ujzf\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600138015;\n\tbh=Xyf6al/f5oHcwylQw85yl2QIbiGRO5CqzUZ3Mev6ayM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=RH+9Ujzf/GVkfirt+9i3BD0MQtwOeMjgXPoAeq/Fldva6gVR6esCLipd8kCCkHyko\n\t883ShJBJIIe6dYs2pU4OgcQKQzr6wlotWZTes/3HsRYXQXGSNXX1hYDogrqzPMsBtN\n\tpGTkfDz5ok1l8WzjTV+pHrvEhpGOoVBxD+p8HzYg=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org,\n\tShow Liu <show.liu@linaro.org>", "Date": "Tue, 15 Sep 2020 05:46:20 +0300", "Message-Id": "<20200915024623.30667-2-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200915024623.30667-1-laurent.pinchart@ideasonboard.com>", "References": "<20200915024623.30667-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v7 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": "From: Show Liu <show.liu@linaro.org>\n\nAdd 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>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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 000000000000..67633a11ee0f\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\tvec3(1.164, 1.164, 1.164),\n+\t\tvec3(0.000, -0.392, 2.017),\n+\t\tvec3(1.596, -0.813, 0.000)\n+\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 000000000000..086c5b6d11bd\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\tvec3(1.164, 1.164, 1.164),\n+\t\tvec3(0.000, -0.392, 2.017),\n+\t\tvec3(1.596, -0.813, 0.000)\n+\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 000000000000..4bc941842710\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\tvec3(1.164, 1.164, 1.164),\n+\t\tvec3(0.000, -0.392, 2.017),\n+\t\tvec3(1.596, -0.813, 0.000)\n+\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 000000000000..12e791e31e32\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 000000000000..33eab2780d5e\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 6ea886a32236..e0c6f26dfef5 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", "v7", "1/4" ] }