Patch Detail
Show a patch.
GET /api/1.1/patches/12692/?format=api
{ "id": 12692, "url": "https://patchwork.libcamera.org/api/1.1/patches/12692/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12692/", "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": "<20210622134652.1279260-9-andrey.konovalov@linaro.org>", "date": "2021-06-22T13:46:51", "name": "[libcamera-devel,v5,8/9] qcam: viewfinder_gl: Add support for RAW8 Bayer formats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ed9a6720ce87945a5adb14049a298cd81334b315", "submitter": { "id": 25, "url": "https://patchwork.libcamera.org/api/1.1/people/25/?format=api", "name": "Andrey Konovalov", "email": "andrey.konovalov@linaro.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12692/mbox/", "series": [ { "id": 2168, "url": "https://patchwork.libcamera.org/api/1.1/series/2168/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2168", "date": "2021-06-22T13:46:43", "name": "qcam: viewfinder_gl: add RAW8, RAW10P and RAW12P formats", "version": 5, "mbox": "https://patchwork.libcamera.org/series/2168/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12692/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12692/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 73FE5C321B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 22 Jun 2021 13:47:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 352FE68935;\n\tTue, 22 Jun 2021 15:47:26 +0200 (CEST)", "from mail-lf1-x135.google.com (mail-lf1-x135.google.com\n\t[IPv6:2a00:1450:4864:20::135])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EF49668935\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Jun 2021 15:47:23 +0200 (CEST)", "by mail-lf1-x135.google.com with SMTP id i18so1611625lfl.8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Jun 2021 06:47:23 -0700 (PDT)", "from localhost.localdomain ([85.249.44.185])\n\tby smtp.googlemail.com with ESMTPSA id\n\tb19sm163125ljo.37.2021.06.22.06.47.22\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 22 Jun 2021 06:47:22 -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=\"exkVNZ1t\"; 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=qlnX/HoUrihRatFwUcg/TBzcFGRWcRTzmu9xMnsm4KA=;\n\tb=exkVNZ1tqSnjz7h82YSFROZ8c7KuuC/zW7aBREa01iYLRFz4ROvGRnu3M7MNuovlsy\n\tczRjEpdgebE8mHow5r7YOEFov1uLpH6B1SnY7qKgMaRT48hmslKQpf4OtwOsSxE24hTA\n\tWBTCjHCHx4TbmDZcj732NNTuidSX5T4LsZYSi7gfVD2enpPtwX1zuDNlvgibFZkLh/4c\n\trBxPmEXhOnLBXDYFxqeLUJz3vLOFN+5++w5ID9q5h1Tu+U5BGWHZJEr6imQ9YlWGWeuU\n\tiT1qKKkKRQfhnH6rsLgNms9J+xN8kdhlZ8zl4gxv/wpPjWtDNAs1QKUPhYyp4gDELJpD\n\tIBMw==", "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=qlnX/HoUrihRatFwUcg/TBzcFGRWcRTzmu9xMnsm4KA=;\n\tb=sR3vVs4/g0dZKVAV6Q+TAXBmL6reusCEZaKAJE0IxEnEcA8WtbEYn1Wdaa4+qdD3YX\n\tDlurJoE8rfjizS2djtTZNBQafbvUeBeYKsE4xzwbJJy41T/2lLMDmZkKpVpmkb1apGpy\n\tRFDh4t2YE7g8uBrHj7W96tl37H7tnqDIwTzDcVSwfIe+0CoG+ng8uZZlZm0tE2eIWBAL\n\tZH2/JAQIEsSvVn0XqAK8i/SkqkZXJNgjhS7l+s2kzfvdhoGqxlbdqQeGP9b8X7MOPOOr\n\tlWMjpZIufPaIDHkKK/kGznKOqyvUIHx3Xpdxrd2D7b39jS1rhGgZolziNVHbKr9Wbk/2\n\teNIQ==", "X-Gm-Message-State": "AOAM531Go0L0OrsyKcPETS4sYRQsv9TpxDRnnIaqy8SkoS48CAktY2Ga\n\tRHxxrXT9v2x8hlfDr1atrlBQ+7RHgQSNEw==", "X-Google-Smtp-Source": "ABdhPJzqaROaj/7t5CZtK/OisI/L8lAiiypJO+kRym6ZZR5l6/P8fkT6hXS9iz8buzQSWfaPcD/CcA==", "X-Received": "by 2002:ac2:5c0b:: with SMTP id\n\tr11mr3101850lfp.655.1624369643374; \n\tTue, 22 Jun 2021 06:47:23 -0700 (PDT)", "From": "Andrey Konovalov <andrey.konovalov@linaro.org>", "To": "libcamera-devel@lists.libcamera.org,\n\tlaurent.pinchart@ideasonboard.com", "Date": "Tue, 22 Jun 2021 16:46:51 +0300", "Message-Id": "<20210622134652.1279260-9-andrey.konovalov@linaro.org>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210622134652.1279260-1-andrey.konovalov@linaro.org>", "References": "<20210622134652.1279260-1-andrey.konovalov@linaro.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 8/9] qcam: viewfinder_gl: Add support\n\tfor RAW8 Bayer formats", "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>", "Cc": "morgan@casual-effects.com", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This integrates the vertex and the fragment shaders by Morgan McGuire\ninto qcam.\n\nSigned-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>\n---\n src/qcam/assets/shader/bayer_8.frag | 9 ++++---\n src/qcam/assets/shader/bayer_8.vert | 26 ++++++++++--------\n src/qcam/assets/shader/shaders.qrc | 2 ++\n src/qcam/viewfinder_gl.cpp | 41 +++++++++++++++++++++++++++--\n 4 files changed, 62 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/qcam/assets/shader/bayer_8.frag b/src/qcam/assets/shader/bayer_8.frag\nindex a7d65e1d..4ece44ab 100644\n--- a/src/qcam/assets/shader/bayer_8.frag\n+++ b/src/qcam/assets/shader/bayer_8.frag\n@@ -9,20 +9,23 @@ Morgan McGuire\n This paper appears in issue Volume 13, Number 4.\n ---------------------------------------------------------\n Copyright (c) 2008, Morgan McGuire. All rights reserved.\n+\n+Modified by Linaro Ltd to integrate it into libcamera.\n+Copyright (C) 2021, Linaro\n */\n \n //Pixel Shader\n \n /** Monochrome RGBA or GL_LUMINANCE Bayer encoded texture.*/\n-uniform sampler2D source;\n+uniform sampler2D tex_y;\n varying vec4 center;\n varying vec4 yCoord;\n varying vec4 xCoord;\n \n void main(void) {\n- #define fetch(x, y) texture2D(source, vec2(x, y)).r\n+ #define fetch(x, y) texture2D(tex_y, vec2(x, y)).r\n \n- float C = texture2D(source, center.xy).r; // ( 0, 0)\n+ float C = texture2D(tex_y, center.xy).r; // ( 0, 0)\n const vec4 kC = vec4( 4.0, 6.0, 5.0, 5.0) / 8.0;\n \n // Determine which of four types of pixels we are on.\ndiff --git a/src/qcam/assets/shader/bayer_8.vert b/src/qcam/assets/shader/bayer_8.vert\nindex 347c15f7..3695a5e9 100644\n--- a/src/qcam/assets/shader/bayer_8.vert\n+++ b/src/qcam/assets/shader/bayer_8.vert\n@@ -9,17 +9,22 @@ Morgan McGuire\n This paper appears in issue Volume 13, Number 4.\n ---------------------------------------------------------\n Copyright (c) 2008, Morgan McGuire. All rights reserved.\n+\n+Modified by Linaro Ltd to integrate it into libcamera.\n+Copyright (C) 2021, Linaro\n */\n \n //Vertex Shader\n \n+attribute vec4 vertexIn;\n+attribute vec2 textureIn;\n \n-/** (w,h,1/w,1/h) */\n-uniform vec4 sourceSize;\n+uniform vec2 tex_size;\t/* The texture size in pixels */\n+uniform vec2 tex_step;\n \n /** Pixel position of the first red pixel in the */\n /** Bayer pattern. [{0,1}, {0, 1}]*/\n-uniform vec2 firstRed;\n+uniform vec2 tex_bayer_first_red;\n \n /** .xy = Pixel being sampled in the fragment shader on the range [0, 1]\n .zw = ...on the range [0, sourceSize], offset by firstRed */\n@@ -34,14 +39,13 @@ varying vec4 xCoord;\n varying vec4 yCoord;\n \n void main(void) {\n- center.xy = gl_MultiTexCoord0.xy;\n- center.zw = gl_MultiTexCoord0.xy * sourceSize.xy + firstRed;\n+ center.xy = textureIn;\n+ center.zw = textureIn * tex_size + tex_bayer_first_red;\n \n- vec2 invSize = sourceSize.zw;\n- xCoord = center.x + vec4(-2.0 * invSize.x,\n- -invSize.x, invSize.x, 2.0 * invSize.x);\n- yCoord = center.y + vec4(-2.0 * invSize.y,\n- -invSize.y, invSize.y, 2.0 * invSize.y);\n+ xCoord = center.x + vec4(-2.0 * tex_step.x,\n+ -tex_step.x, tex_step.x, 2.0 * tex_step.x);\n+ yCoord = center.y + vec4(-2.0 * tex_step.y,\n+ -tex_step.y, tex_step.y, 2.0 * tex_step.y);\n \n- gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n+ gl_Position = vertexIn;\n }\ndiff --git a/src/qcam/assets/shader/shaders.qrc b/src/qcam/assets/shader/shaders.qrc\nindex d76d65c5..96c709f9 100644\n--- a/src/qcam/assets/shader/shaders.qrc\n+++ b/src/qcam/assets/shader/shaders.qrc\n@@ -6,6 +6,8 @@\n \t<file>YUV_3_planes.frag</file>\n \t<file>YUV_packed.frag</file>\n \t<file>bayer_1x_packed.frag</file>\n+\t<file>bayer_8.frag</file>\n+\t<file>bayer_8.vert</file>\n \t<file>identity.vert</file>\n </qresource>\n </RCC>\ndiff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nindex 6d1d80bd..e7c8620c 100644\n--- a/src/qcam/viewfinder_gl.cpp\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -36,6 +36,11 @@ static const QList<libcamera::PixelFormat> supportedFormats{\n \tlibcamera::formats::RGBA8888,\n \tlibcamera::formats::BGR888,\n \tlibcamera::formats::RGB888,\n+\t/* Raw Bayer 8-bit */\n+\tlibcamera::formats::SBGGR8,\n+\tlibcamera::formats::SGBRG8,\n+\tlibcamera::formats::SGRBG8,\n+\tlibcamera::formats::SRGGB8,\n \t/* Raw Bayer 10-bit packed */\n \tlibcamera::formats::SBGGR10_CSI2P,\n \tlibcamera::formats::SGBRG10_CSI2P,\n@@ -223,6 +228,34 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n \t\tfragmentShaderDefines_.append(\"#define RGB_PATTERN bgr\");\n \t\tfragmentShaderFile_ = \":RGB.frag\";\n \t\tbreak;\n+\tcase libcamera::formats::SBGGR8:\n+\t\tfirstRed_.setX(1.0);\n+\t\tfirstRed_.setY(1.0);\n+\t\tvertexShaderFile_ = \":bayer_8.vert\";\n+\t\tfragmentShaderFile_ = \":bayer_8.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n+\tcase libcamera::formats::SGBRG8:\n+\t\tfirstRed_.setX(0.0);\n+\t\tfirstRed_.setY(1.0);\n+\t\tvertexShaderFile_ = \":bayer_8.vert\";\n+\t\tfragmentShaderFile_ = \":bayer_8.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n+\tcase libcamera::formats::SGRBG8:\n+\t\tfirstRed_.setX(1.0);\n+\t\tfirstRed_.setY(0.0);\n+\t\tvertexShaderFile_ = \":bayer_8.vert\";\n+\t\tfragmentShaderFile_ = \":bayer_8.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n+\tcase libcamera::formats::SRGGB8:\n+\t\tfirstRed_.setX(0.0);\n+\t\tfirstRed_.setY(0.0);\n+\t\tvertexShaderFile_ = \":bayer_8.vert\";\n+\t\tfragmentShaderFile_ = \":bayer_8.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n \tcase libcamera::formats::SBGGR10_CSI2P:\n \t\tfirstRed_.setX(1.0);\n \t\tfirstRed_.setY(1.0);\n@@ -627,6 +660,10 @@ void ViewFinderGL::doRender()\n \t\tshaderProgram_.setUniformValue(textureUniformY_, 0);\n \t\tbreak;\n \n+\tcase libcamera::formats::SBGGR8:\n+\tcase libcamera::formats::SGBRG8:\n+\tcase libcamera::formats::SGRBG8:\n+\tcase libcamera::formats::SRGGB8:\n \tcase libcamera::formats::SBGGR10_CSI2P:\n \tcase libcamera::formats::SGBRG10_CSI2P:\n \tcase libcamera::formats::SGRBG10_CSI2P:\n@@ -636,8 +673,8 @@ void ViewFinderGL::doRender()\n \tcase libcamera::formats::SGRBG12_CSI2P:\n \tcase libcamera::formats::SRGGB12_CSI2P:\n \t\t/*\n-\t\t * Packed raw Bayer 10-bit and 12-bit formats are stored in\n-\t\t * GL_RED texture.\n+\t\t * Raw Bayer 8-bit, and packed raw Bayer 10-bit/12-bit formats\n+\t\t * are stored in GL_RED texture.\n \t\t * The texture width is equal to the stride.\n \t\t */\n \t\tglActiveTexture(GL_TEXTURE0);\n", "prefixes": [ "libcamera-devel", "v5", "8/9" ] }