Patch Detail
Show a patch.
GET /api/patches/16089/?format=api
{ "id": 16089, "url": "https://patchwork.libcamera.org/api/patches/16089/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16089/", "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": "<20220527144447.94891-20-tomi.valkeinen@ideasonboard.com>", "date": "2022-05-27T14:44:36", "name": "[libcamera-devel,v3,19/30] py: cam: Move conversion funcs to helpers.py", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "39775e83fe6ad23b6d4df23bd2f75e1e2f27ca54", "submitter": { "id": 109, "url": "https://patchwork.libcamera.org/api/people/109/?format=api", "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16089/mbox/", "series": [ { "id": 3146, "url": "https://patchwork.libcamera.org/api/series/3146/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3146", "date": "2022-05-27T14:44:17", "name": "More misc Python patches", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3146/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16089/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16089/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 051E6C326E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 27 May 2022 14:45:31 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 93B34656A0;\n\tFri, 27 May 2022 16:45:30 +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 5B70A65639\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 27 May 2022 16:45:14 +0200 (CEST)", "from deskari.lan (91-156-85-209.elisa-laajakaista.fi\n\t[91.156.85.209])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B833D3B8C;\n\tFri, 27 May 2022 16:45:13 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653662730;\n\tbh=sx7lC/g+oXgtl0/KoyDSOnBN1Tlvwis7V8iZQfxBzJk=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=xOxE5gEhI8Ulw5PQbr7PHqpB4RUOTHBk2owLV+QAwtIvQTfgzQ3FGvP5VnBcq8hr8\n\t7dD5IteqWMbSPn6Rqt3BIKF4EVUekcZx2kqEYMjgd63E/JYFs8rkSEkXyf06f6Yxhw\n\tH3JdCLm4hAVcF9saPW1cgo2CXh2eqIeGGkL14urAshdQge8gHrRPigTIqbLUaOcJvK\n\tgQSdtbynhJ27/FKo4pzBuCSzKkFO0nMFoFJnWiraWAWh6Gdel2CLo/WT3n4bfkIQ7c\n\tysa35hG6wDarVU4xPryGoigYE5K4kFBtft21aKBUpKGROqiSN70sXF5NP/6FBPJNt1\n\tel8xTlgCpQ6PQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653662714;\n\tbh=sx7lC/g+oXgtl0/KoyDSOnBN1Tlvwis7V8iZQfxBzJk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=hj/sO7VgTApSxyzCBdGqHFnRl024RG46X/5hnEV5yFwHiWM/L7lxAROXy72HyzhyZ\n\t6YERr+8ZhU1hx0q8Cj4q+ufiW5QneAYLQSe4WtekW1m4ChDwyhA8odAk/qeSPH2F2R\n\tKc7MBjvUwMgPv17Ewa5F+k542MgxTbmqwxo/hI+o=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"hj/sO7Vg\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org,\n\tDavid Plowman <david.plowman@raspberrypi.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tJacopo Mondi <jacopo@jmondi.org>", "Date": "Fri, 27 May 2022 17:44:36 +0300", "Message-Id": "<20220527144447.94891-20-tomi.valkeinen@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220527144447.94891-1-tomi.valkeinen@ideasonboard.com>", "References": "<20220527144447.94891-1-tomi.valkeinen@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 19/30] py: cam: Move conversion funcs\n\tto helpers.py", "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>", "From": "Tomi Valkeinen via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Move conversion functions from cam_qt.py to helpers.py to clean up the\ncode and so that they can be used from other cam renderers.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n---\n src/py/cam/cam_qt.py | 157 +--------------------------\n src/py/cam/{cam_qt.py => helpers.py} | 155 +-------------------------\n 2 files changed, 2 insertions(+), 310 deletions(-)\n copy src/py/cam/{cam_qt.py => helpers.py} (55%)", "diff": "diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\nindex c294c999..af4b0f86 100644\n--- a/src/py/cam/cam_qt.py\n+++ b/src/py/cam/cam_qt.py\n@@ -1,19 +1,15 @@\n # SPDX-License-Identifier: GPL-2.0-or-later\n # Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n-#\n-# Debayering code from PiCamera documentation\n \n+from helpers import mfb_to_rgb\n from io import BytesIO\n-from numpy.lib.stride_tricks import as_strided\n from PIL import Image\n from PIL.ImageQt import ImageQt\n from PyQt5 import QtCore, QtGui, QtWidgets\n import libcamera as libcam\n import libcamera.utils\n-import numpy as np\n import sys\n \n-\n def rgb_to_pix(rgb):\n img = Image.frombuffer('RGB', (rgb.shape[1], rgb.shape[0]), rgb)\n qim = ImageQt(img).copy()\n@@ -21,157 +17,6 @@ def rgb_to_pix(rgb):\n return pix\n \n \n-def demosaic(data, r0, g0, g1, b0):\n- # Separate the components from the Bayer data to RGB planes\n-\n- rgb = np.zeros(data.shape + (3,), dtype=data.dtype)\n- rgb[r0[1]::2, r0[0]::2, 0] = data[r0[1]::2, r0[0]::2] # Red\n- rgb[g0[1]::2, g0[0]::2, 1] = data[g0[1]::2, g0[0]::2] # Green\n- rgb[g1[1]::2, g1[0]::2, 1] = data[g1[1]::2, g1[0]::2] # Green\n- rgb[b0[1]::2, b0[0]::2, 2] = data[b0[1]::2, b0[0]::2] # Blue\n-\n- # Below we present a fairly naive de-mosaic method that simply\n- # calculates the weighted average of a pixel based on the pixels\n- # surrounding it. The weighting is provided by a byte representation of\n- # the Bayer filter which we construct first:\n-\n- bayer = np.zeros(rgb.shape, dtype=np.uint8)\n- bayer[r0[1]::2, r0[0]::2, 0] = 1 # Red\n- bayer[g0[1]::2, g0[0]::2, 1] = 1 # Green\n- bayer[g1[1]::2, g1[0]::2, 1] = 1 # Green\n- bayer[b0[1]::2, b0[0]::2, 2] = 1 # Blue\n-\n- # Allocate an array to hold our output with the same shape as the input\n- # data. After this we define the size of window that will be used to\n- # calculate each weighted average (3x3). Then we pad out the rgb and\n- # bayer arrays, adding blank pixels at their edges to compensate for the\n- # size of the window when calculating averages for edge pixels.\n-\n- output = np.empty(rgb.shape, dtype=rgb.dtype)\n- window = (3, 3)\n- borders = (window[0] - 1, window[1] - 1)\n- border = (borders[0] // 2, borders[1] // 2)\n-\n- rgb = np.pad(rgb, [\n- (border[0], border[0]),\n- (border[1], border[1]),\n- (0, 0),\n- ], 'constant')\n- bayer = np.pad(bayer, [\n- (border[0], border[0]),\n- (border[1], border[1]),\n- (0, 0),\n- ], 'constant')\n-\n- # For each plane in the RGB data, we use a nifty numpy trick\n- # (as_strided) to construct a view over the plane of 3x3 matrices. We do\n- # the same for the bayer array, then use Einstein summation on each\n- # (np.sum is simpler, but copies the data so it's slower), and divide\n- # the results to get our weighted average:\n-\n- for plane in range(3):\n- p = rgb[..., plane]\n- b = bayer[..., plane]\n- pview = as_strided(p, shape=(\n- p.shape[0] - borders[0],\n- p.shape[1] - borders[1]) + window, strides=p.strides * 2)\n- bview = as_strided(b, shape=(\n- b.shape[0] - borders[0],\n- b.shape[1] - borders[1]) + window, strides=b.strides * 2)\n- psum = np.einsum('ijkl->ij', pview)\n- bsum = np.einsum('ijkl->ij', bview)\n- output[..., plane] = psum // bsum\n-\n- return output\n-\n-\n-def to_rgb(fmt, size, data):\n- w = size.width\n- h = size.height\n-\n- if fmt == libcam.formats.YUYV:\n- # YUV422\n- yuyv = data.reshape((h, w // 2 * 4))\n-\n- # YUV444\n- yuv = np.empty((h, w, 3), dtype=np.uint8)\n- yuv[:, :, 0] = yuyv[:, 0::2] # Y\n- yuv[:, :, 1] = yuyv[:, 1::4].repeat(2, axis=1) # U\n- yuv[:, :, 2] = yuyv[:, 3::4].repeat(2, axis=1) # V\n-\n- m = np.array([\n- [1.0, 1.0, 1.0],\n- [-0.000007154783816076815, -0.3441331386566162, 1.7720025777816772],\n- [1.4019975662231445, -0.7141380310058594, 0.00001542569043522235]\n- ])\n-\n- rgb = np.dot(yuv, m)\n- rgb[:, :, 0] -= 179.45477266423404\n- rgb[:, :, 1] += 135.45870971679688\n- rgb[:, :, 2] -= 226.8183044444304\n- rgb = rgb.astype(np.uint8)\n-\n- elif fmt == libcam.formats.RGB888:\n- rgb = data.reshape((h, w, 3))\n- rgb[:, :, [0, 1, 2]] = rgb[:, :, [2, 1, 0]]\n-\n- elif fmt == libcam.formats.BGR888:\n- rgb = data.reshape((h, w, 3))\n-\n- elif fmt in [libcam.formats.ARGB8888, libcam.formats.XRGB8888]:\n- rgb = data.reshape((h, w, 4))\n- rgb = np.flip(rgb, axis=2)\n- # drop alpha component\n- rgb = np.delete(rgb, np.s_[0::4], axis=2)\n-\n- elif str(fmt).startswith('S'):\n- fmt = str(fmt)\n- bayer_pattern = fmt[1:5]\n- bitspp = int(fmt[5:])\n-\n- # \\todo shifting leaves the lowest bits 0\n- if bitspp == 8:\n- data = data.reshape((h, w))\n- data = data.astype(np.uint16) << 8\n- elif bitspp in [10, 12]:\n- data = data.view(np.uint16)\n- data = data.reshape((h, w))\n- data = data << (16 - bitspp)\n- else:\n- raise Exception('Bad bitspp:' + str(bitspp))\n-\n- idx = bayer_pattern.find('R')\n- assert(idx != -1)\n- r0 = (idx % 2, idx // 2)\n-\n- idx = bayer_pattern.find('G')\n- assert(idx != -1)\n- g0 = (idx % 2, idx // 2)\n-\n- idx = bayer_pattern.find('G', idx + 1)\n- assert(idx != -1)\n- g1 = (idx % 2, idx // 2)\n-\n- idx = bayer_pattern.find('B')\n- assert(idx != -1)\n- b0 = (idx % 2, idx // 2)\n-\n- rgb = demosaic(data, r0, g0, g1, b0)\n- rgb = (rgb >> 8).astype(np.uint8)\n-\n- else:\n- rgb = None\n-\n- return rgb\n-\n-\n-# A naive format conversion to 24-bit RGB\n-def mfb_to_rgb(mfb, cfg):\n- data = np.array(mfb.planes[0], dtype=np.uint8)\n- rgb = to_rgb(cfg.pixel_format, cfg.size, data)\n- return rgb\n-\n-\n class QtRenderer:\n def __init__(self, state):\n self.state = state\ndiff --git a/src/py/cam/cam_qt.py b/src/py/cam/helpers.py\nsimilarity index 55%\ncopy from src/py/cam/cam_qt.py\ncopy to src/py/cam/helpers.py\nindex c294c999..d571c753 100644\n--- a/src/py/cam/cam_qt.py\n+++ b/src/py/cam/helpers.py\n@@ -3,23 +3,10 @@\n #\n # Debayering code from PiCamera documentation\n \n-from io import BytesIO\n from numpy.lib.stride_tricks import as_strided\n-from PIL import Image\n-from PIL.ImageQt import ImageQt\n-from PyQt5 import QtCore, QtGui, QtWidgets\n import libcamera as libcam\n import libcamera.utils\n import numpy as np\n-import sys\n-\n-\n-def rgb_to_pix(rgb):\n- img = Image.frombuffer('RGB', (rgb.shape[1], rgb.shape[0]), rgb)\n- qim = ImageQt(img).copy()\n- pix = QtGui.QPixmap.fromImage(qim)\n- return pix\n-\n \n def demosaic(data, r0, g0, g1, b0):\n # Separate the components from the Bayer data to RGB planes\n@@ -166,147 +153,7 @@ def to_rgb(fmt, size, data):\n \n \n # A naive format conversion to 24-bit RGB\n-def mfb_to_rgb(mfb, cfg):\n+def mfb_to_rgb(mfb: libcamera.utils.MappedFrameBuffer, cfg: libcam.StreamConfiguration):\n data = np.array(mfb.planes[0], dtype=np.uint8)\n rgb = to_rgb(cfg.pixel_format, cfg.size, data)\n return rgb\n-\n-\n-class QtRenderer:\n- def __init__(self, state):\n- self.state = state\n-\n- self.cm = state.cm\n- self.contexts = state.contexts\n-\n- def setup(self):\n- self.app = QtWidgets.QApplication([])\n-\n- windows = []\n-\n- for ctx in self.contexts:\n- for stream in ctx.streams:\n- window = MainWindow(ctx, stream)\n- window.show()\n- windows.append(window)\n-\n- self.windows = windows\n-\n- def run(self):\n- camnotif = QtCore.QSocketNotifier(self.cm.event_fd, QtCore.QSocketNotifier.Read)\n- camnotif.activated.connect(lambda _: self.readcam())\n-\n- keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)\n- keynotif.activated.connect(lambda _: self.readkey())\n-\n- print('Capturing...')\n-\n- self.app.exec()\n-\n- print('Exiting...')\n-\n- def readcam(self):\n- running = self.state.event_handler()\n-\n- if not running:\n- self.app.quit()\n-\n- def readkey(self):\n- sys.stdin.readline()\n- self.app.quit()\n-\n- def request_handler(self, ctx, req):\n- buffers = req.buffers\n-\n- for stream, fb in buffers.items():\n- wnd = next(wnd for wnd in self.windows if wnd.stream == stream)\n-\n- wnd.handle_request(stream, fb)\n-\n- self.state.request_processed(ctx, req)\n-\n- def cleanup(self):\n- for w in self.windows:\n- w.close()\n-\n-\n-class MainWindow(QtWidgets.QWidget):\n- def __init__(self, ctx, stream):\n- super().__init__()\n-\n- self.ctx = ctx\n- self.stream = stream\n-\n- self.label = QtWidgets.QLabel()\n-\n- windowLayout = QtWidgets.QHBoxLayout()\n- self.setLayout(windowLayout)\n-\n- windowLayout.addWidget(self.label)\n-\n- controlsLayout = QtWidgets.QVBoxLayout()\n- windowLayout.addLayout(controlsLayout)\n-\n- windowLayout.addStretch()\n-\n- group = QtWidgets.QGroupBox('Info')\n- groupLayout = QtWidgets.QVBoxLayout()\n- group.setLayout(groupLayout)\n- controlsLayout.addWidget(group)\n-\n- lab = QtWidgets.QLabel(ctx.id)\n- groupLayout.addWidget(lab)\n-\n- self.frameLabel = QtWidgets.QLabel()\n- groupLayout.addWidget(self.frameLabel)\n-\n- group = QtWidgets.QGroupBox('Properties')\n- groupLayout = QtWidgets.QVBoxLayout()\n- group.setLayout(groupLayout)\n- controlsLayout.addWidget(group)\n-\n- camera = ctx.camera\n-\n- for cid, cv in camera.properties.items():\n- lab = QtWidgets.QLabel()\n- lab.setText('{} = {}'.format(cid, cv))\n- groupLayout.addWidget(lab)\n-\n- group = QtWidgets.QGroupBox('Controls')\n- groupLayout = QtWidgets.QVBoxLayout()\n- group.setLayout(groupLayout)\n- controlsLayout.addWidget(group)\n-\n- for cid, cinfo in camera.controls.items():\n- lab = QtWidgets.QLabel()\n- lab.setText('{} = {}/{}/{}'\n- .format(cid, cinfo.min, cinfo.max, cinfo.default))\n- groupLayout.addWidget(lab)\n-\n- controlsLayout.addStretch()\n-\n- def buf_to_qpixmap(self, stream, fb):\n- with libcamera.utils.MappedFrameBuffer(fb) as mfb:\n- cfg = stream.configuration\n-\n- if cfg.pixel_format == libcam.formats.MJPEG:\n- img = Image.open(BytesIO(mfb.planes[0]))\n- qim = ImageQt(img).copy()\n- pix = QtGui.QPixmap.fromImage(qim)\n- else:\n- rgb = mfb_to_rgb(mfb, cfg)\n- if rgb is None:\n- raise Exception('Format not supported: ' + cfg.pixel_format)\n-\n- pix = rgb_to_pix(rgb)\n-\n- return pix\n-\n- def handle_request(self, stream, fb):\n- ctx = self.ctx\n-\n- pix = self.buf_to_qpixmap(stream, fb)\n- self.label.setPixmap(pix)\n-\n- self.frameLabel.setText('Queued: {}\\nDone: {}\\nFps: {:.2f}'\n- .format(ctx.reqs_queued, ctx.reqs_completed, ctx.fps))\n", "prefixes": [ "libcamera-devel", "v3", "19/30" ] }