Patch Detail
Show a patch.
GET /api/1.1/patches/12687/?format=api
{ "id": 12687, "url": "https://patchwork.libcamera.org/api/1.1/patches/12687/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12687/", "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-4-andrey.konovalov@linaro.org>", "date": "2021-06-22T13:46:46", "name": "[libcamera-devel,v5,3/9] qcam: viewfinder_gl: Add support for RAW12 packed formats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "47d655b8c7d458ac72e754d052130527fe27a798", "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/12687/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/12687/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12687/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 535E0C321B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 22 Jun 2021 13:47:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1447A68932;\n\tTue, 22 Jun 2021 15:47:13 +0200 (CEST)", "from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com\n\t[IPv6:2a00:1450:4864:20::22d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9FE3560292\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Jun 2021 15:47:11 +0200 (CEST)", "by mail-lj1-x22d.google.com with SMTP id d13so30160909ljg.12\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Jun 2021 06:47:11 -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.10\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 22 Jun 2021 06:47:10 -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=\"qTirR6cB\"; 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=226tjDItQWgHgHoqkprwEDWkO92QkxHcaVY0hI7V8f8=;\n\tb=qTirR6cBQT4rMqk+DB3gtanit6Gy/2lPGJ3XzMm2hYrH6qveNG1eoT5vuc8lqrLV2/\n\tMQXZGZfe29002uXYgwC8/YvPcNJM4lvEeDp/mitDeeNPWJcX4rm7pQOW2+Rh1qMwJB8h\n\tW89wUwNVOEr50heerHwLppAndTchSySSRqnUCPOQUeuJyVNMo0KJH0Z7vh3q1Gzhl5QC\n\tbJDFkZAVZx915lpBlsFA0KTIxKTGC6vjaJROf7KVuhJS7X14U8sZggUZBjAiKNEDy7nQ\n\tqTQcACdE30l/ms6O/l0V0c+JJNzgnVUKXZQNpCFiWZhPU6wwwAVLmvvMET/9BEKugiuT\n\tH/tg==", "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=226tjDItQWgHgHoqkprwEDWkO92QkxHcaVY0hI7V8f8=;\n\tb=swRPSoel2x2OkIB1WTWMEmiU/bMBW3bIOG861LHorkjmb0TWJdJFZS0Dx4wV0lVbLQ\n\tfMQv0WQnT64wfhkjpXkgz0bnuuaf2NaCAYCtscPYppbGr8m2oXYFcLOP3Yn1eGGVsCJu\n\ttJUgtBdL51gV7W7ZZ2d3CCT/B4OeIqNplAN5QgTsSqIFz1xWZ9xz0KOkbshTP+e3+7Bd\n\tmeSkdoRxaiAqqYmtTFFHPiYlEzKgVBStQeyVKsGImmYeCbC6k1aN4PAuQ4zk2u/ciRhF\n\t6JwlogylsFTuSokMzf4t5ZGrnZ7NZbKDs++vLzbu5S6P9GOfcNYP9tT8En1AbfT41aSj\n\taxWg==", "X-Gm-Message-State": "AOAM530bgCRF+zMRC6eVy6o1X/4s5+RN2tSQ1KxPbBlHsgftiNfzxFaW\n\tJtK4Y3O+TLdc0iEkFaNWl7uVuCGKu8G31g==", "X-Google-Smtp-Source": "ABdhPJwqDzI6taMucLK+yf4hX0wOYf//mQXGce1TplMOQkq9jE58aOx+jV7vHsxJKxhOf8/pfHQ+Rw==", "X-Received": "by 2002:a2e:95d8:: with SMTP id\n\ty24mr3312055ljh.368.1624369631099; \n\tTue, 22 Jun 2021 06:47:11 -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:46 +0300", "Message-Id": "<20210622134652.1279260-4-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 3/9] qcam: viewfinder_gl: Add support\n\tfor RAW12 packed 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": "All the four Bayer orders are supported.\nThe 4 LS bits of the 12-bit colour values are dropped as the RGBA\nformat we convert into has only 8 bits per colour.\n\nSigned-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/qcam/assets/shader/bayer_1x_packed.frag | 43 +++++++++++++++---\n src/qcam/viewfinder_gl.cpp | 48 ++++++++++++++++++---\n 2 files changed, 80 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/qcam/assets/shader/bayer_1x_packed.frag b/src/qcam/assets/shader/bayer_1x_packed.frag\nindex fac8c3b8..5da9dce5 100644\n--- a/src/qcam/assets/shader/bayer_1x_packed.frag\n+++ b/src/qcam/assets/shader/bayer_1x_packed.frag\n@@ -23,6 +23,40 @@\n precision mediump float;\n #endif\n \n+/*\n+ * These constants are used to select the bytes containing the HS part of\n+ * the pixel value:\n+ * BPP - bytes per pixel,\n+ * THRESHOLD_L = fract(BPP) * 0.5 + 0.02\n+ * THRESHOLD_H = 1.0 - fract(BPP) * 1.5 + 0.02\n+ * Let X is the x coordinate in the texture measured in bytes (so that the\n+ * range is from 0 to (stride_-1)) aligned on the nearest pixel.\n+ * E.g. for RAW10P:\n+ * -------------+-------------------+-------------------+--\n+ * pixel No | 0 1 2 3 | 4 5 6 7 | ...\n+ * -------------+-------------------+-------------------+--\n+ * byte offset | 0 1 2 3 4 | 5 6 7 8 9 | ...\n+ * -------------+-------------------+-------------------+--\n+ * X | 0.0 1.25 2.5 3.75 | 5.0 6.25 7.5 8.75 | ...\n+ * -------------+-------------------+-------------------+--\n+ * If fract(X) < THRESHOLD_L then the previous byte contains the LS\n+ * bits of the pixel values and needs to be skipped.\n+ * If fract(X) > THRESHOLD_H then the next byte contains the LS bits\n+ * of the pixel values and needs to be skipped.\n+ */\n+#if defined(RAW10P)\n+#define BPP\t\t1.25\n+#define THRESHOLD_L\t0.14\n+#define THRESHOLD_H\t0.64\n+#elif defined(RAW12P)\n+#define BPP\t\t1.5\n+#define THRESHOLD_L\t0.27\n+#define THRESHOLD_H\t0.27\n+#else\n+#error Invalid raw format\n+#endif\n+\n+\n varying vec2 textureOut;\n \n /* the texture size in pixels */\n@@ -66,10 +100,7 @@ void main(void)\n \t * Add a small number (a few mantissa's LSBs) to avoid float\n \t * representation issues. Maybe paranoic.\n \t */\n-\tcenter_bytes.x = BPP_X * center_pixel.x + 0.02;\n-\n-\tconst float threshold_l = 0.127 /* fract(BPP_X) * 0.5 + 0.02 */;\n-\tconst float threshold_h = 0.625 /* 1.0 - fract(BPP_X) * 1.5 */;\n+\tcenter_bytes.x = BPP * center_pixel.x + 0.02;\n \n \tfloat fract_x = fract(center_bytes.x);\n \n@@ -90,14 +121,14 @@ void main(void)\n \t * of the previous group of the pixels, move xcoords[0] one\n \t * byte back.\n \t */\n-\txcoords[0] += (fract_x < threshold_l) ? -tex_step.x : 0.0;\n+\txcoords[0] += (fract_x < THRESHOLD_L) ? -tex_step.x : 0.0;\n \n \t/*\n \t * If xcoords[1] points at the byte containing the LS bits\n \t * of the current group of the pixels, move xcoords[1] one\n \t * byte forward.\n \t */\n-\txcoords[1] += (fract_x > threshold_h) ? tex_step.x : 0.0;\n+\txcoords[1] += (fract_x > THRESHOLD_H) ? tex_step.x : 0.0;\n \n \tvec2 alternate = mod(center_pixel.xy + tex_bayer_first_red, 2.0);\n \tbool even_col = alternate.x < 1.0;\ndiff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nindex ffbbc6c5..a6aa2b44 100644\n--- a/src/qcam/viewfinder_gl.cpp\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -41,6 +41,11 @@ static const QList<libcamera::PixelFormat> supportedFormats{\n \tlibcamera::formats::SGBRG10_CSI2P,\n \tlibcamera::formats::SGRBG10_CSI2P,\n \tlibcamera::formats::SRGGB10_CSI2P,\n+\t/* Raw Bayer 12-bit packed */\n+\tlibcamera::formats::SBGGR12_CSI2P,\n+\tlibcamera::formats::SGBRG12_CSI2P,\n+\tlibcamera::formats::SGRBG12_CSI2P,\n+\tlibcamera::formats::SRGGB12_CSI2P,\n };\n \n ViewFinderGL::ViewFinderGL(QWidget *parent)\n@@ -218,28 +223,56 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n \tcase libcamera::formats::SBGGR10_CSI2P:\n \t\tfirstRed_.setX(1.0);\n \t\tfirstRed_.setY(1.0);\n-\t\tfragmentShaderDefines_.append(\"#define BPP_X 1.25\");\n+\t\tfragmentShaderDefines_.append(\"#define RAW10P\");\n \t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n \tcase libcamera::formats::SGBRG10_CSI2P:\n \t\tfirstRed_.setX(0.0);\n \t\tfirstRed_.setY(1.0);\n-\t\tfragmentShaderDefines_.append(\"#define BPP_X 1.25\");\n+\t\tfragmentShaderDefines_.append(\"#define RAW10P\");\n \t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n \tcase libcamera::formats::SGRBG10_CSI2P:\n \t\tfirstRed_.setX(1.0);\n \t\tfirstRed_.setY(0.0);\n-\t\tfragmentShaderDefines_.append(\"#define BPP_X 1.25\");\n+\t\tfragmentShaderDefines_.append(\"#define RAW10P\");\n \t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n \tcase libcamera::formats::SRGGB10_CSI2P:\n \t\tfirstRed_.setX(0.0);\n \t\tfirstRed_.setY(0.0);\n-\t\tfragmentShaderDefines_.append(\"#define BPP_X 1.25\");\n+\t\tfragmentShaderDefines_.append(\"#define RAW10P\");\n+\t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n+\tcase libcamera::formats::SBGGR12_CSI2P:\n+\t\tfirstRed_.setX(1.0);\n+\t\tfirstRed_.setY(1.0);\n+\t\tfragmentShaderDefines_.append(\"#define RAW12P\");\n+\t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n+\tcase libcamera::formats::SGBRG12_CSI2P:\n+\t\tfirstRed_.setX(0.0);\n+\t\tfirstRed_.setY(1.0);\n+\t\tfragmentShaderDefines_.append(\"#define RAW12P\");\n+\t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n+\tcase libcamera::formats::SGRBG12_CSI2P:\n+\t\tfirstRed_.setX(1.0);\n+\t\tfirstRed_.setY(0.0);\n+\t\tfragmentShaderDefines_.append(\"#define RAW12P\");\n+\t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n+\t\ttextureMinMagFilters_ = GL_NEAREST;\n+\t\tbreak;\n+\tcase libcamera::formats::SRGGB12_CSI2P:\n+\t\tfirstRed_.setX(0.0);\n+\t\tfirstRed_.setY(0.0);\n+\t\tfragmentShaderDefines_.append(\"#define RAW12P\");\n \t\tfragmentShaderFile_ = \":bayer_1x_packed.frag\";\n \t\ttextureMinMagFilters_ = GL_NEAREST;\n \t\tbreak;\n@@ -595,8 +628,13 @@ void ViewFinderGL::doRender()\n \tcase libcamera::formats::SGBRG10_CSI2P:\n \tcase libcamera::formats::SGRBG10_CSI2P:\n \tcase libcamera::formats::SRGGB10_CSI2P:\n+\tcase libcamera::formats::SBGGR12_CSI2P:\n+\tcase libcamera::formats::SGBRG12_CSI2P:\n+\tcase libcamera::formats::SGRBG12_CSI2P:\n+\tcase libcamera::formats::SRGGB12_CSI2P:\n \t\t/*\n-\t\t * Packed raw Bayer 10-bit formats are stored in GL_RED texture.\n+\t\t * Packed raw Bayer 10-bit and 12-bit formats are stored in\n+\t\t * 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", "3/9" ] }