Patch Detail
Show a patch.
GET /api/1.1/patches/16078/?format=api
{ "id": 16078, "url": "https://patchwork.libcamera.org/api/1.1/patches/16078/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16078/", "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": "<20220527144447.94891-8-tomi.valkeinen@ideasonboard.com>", "date": "2022-05-27T14:44:24", "name": "[libcamera-devel,v3,07/30] py: Move MappedFrameBuffer to libcamera.utils", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0e54274ac54b7c575dc17bdef99ae16ce017b2a8", "submitter": { "id": 109, "url": "https://patchwork.libcamera.org/api/1.1/people/109/?format=api", "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16078/mbox/", "series": [ { "id": 3146, "url": "https://patchwork.libcamera.org/api/1.1/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/16078/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16078/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 A20BAC326D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 27 May 2022 14:45:17 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0B0C065658;\n\tFri, 27 May 2022 16:45:16 +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 1645D65639\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 27 May 2022 16:45:08 +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 8BD2A10CA;\n\tFri, 27 May 2022 16:45:07 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653662716;\n\tbh=8XqGJsPOn6Mb//x5iBtbhruddCZgxAWLKxp6Y2o8+n4=;\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=iCAbzqkBWosMmU5ojoNm7ThwbXRgxB64oWotUCXaUMcWtbj5Xhc8njuZbBeM6ZNvx\n\t6CqF6uRISaXMnscRTrHkSHE7j/EqT1mF8ZGGGF3nUASlNo/imKXU9NuZcHvjW2gm2x\n\t4wjNN2r6jM885cV6coDMwvKerVAGVRhapUOxlhK2a36KU5CDd6J9jAoWgO4Mtn6F41\n\tiNf1fv2ssJjkWBznmt6IxCWAw/rJ8FvR2/2COYVO5yM23KyjF5EUCw9wIw4HXnC/no\n\t4nvnxhiYFYmr8yuLcsdY2v6BBm0kvIY/eKUqrRpksp+5/eXTY3l30Y2HFJF467mv4y\n\tZCVsyB3RZ5tCg==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653662707;\n\tbh=8XqGJsPOn6Mb//x5iBtbhruddCZgxAWLKxp6Y2o8+n4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=QwYbFJa2rjxwKsoUiA/nRlQBOxBCdpwW//d3i/HhDnw+kM9HlvV+EzUac2aOULaeX\n\t5OPGddESFpo96/MzUQ4HlMgui9lvTQsJ58cTt/xkRP1I09rAgMcl0pOtILR8DoRd53\n\tzvPDdFXzZ/0bhLIUJlldJ97QtZbgJHJM1JpIO0Ng=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"QwYbFJa2\"; 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:24 +0300", "Message-Id": "<20220527144447.94891-8-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 07/30] py: Move MappedFrameBuffer to\n\tlibcamera.utils", "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 MappedFrameBuffer to libcamera.utils, instead of extending\nFrameBuffer class with a new mmap() method. This keeps us more aligned\nto the C++ API.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/py/cam/cam.py | 5 +-\n src/py/cam/cam_qt.py | 3 +-\n src/py/libcamera/__init__.py | 80 -------------------\n src/py/libcamera/meson.build | 4 +\n .../MappedFrameBuffer.py} | 10 ---\n src/py/libcamera/utils/__init__.py | 4 +\n 6 files changed, 13 insertions(+), 93 deletions(-)\n copy src/py/libcamera/{__init__.py => utils/MappedFrameBuffer.py} (93%)\n create mode 100644 src/py/libcamera/utils/__init__.py", "diff": "diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\nindex 66df18bf..64f67e86 100755\n--- a/src/py/cam/cam.py\n+++ b/src/py/cam/cam.py\n@@ -9,6 +9,7 @@\n import argparse\n import binascii\n import libcamera as libcam\n+import libcamera.utils\n import sys\n import traceback\n \n@@ -327,7 +328,7 @@ def request_handler(state, ctx, req):\n \n crcs = []\n if ctx['opt-crc']:\n- with fb.mmap() as mfb:\n+ with libcamera.utils.MappedFrameBuffer(fb) as mfb:\n plane_crcs = [binascii.crc32(p) for p in mfb.planes]\n crcs.append(plane_crcs)\n \n@@ -345,7 +346,7 @@ def request_handler(state, ctx, req):\n print(f'\\t{ctrl} = {val}')\n \n if ctx['opt-save-frames']:\n- with fb.mmap() as mfb:\n+ with libcamera.utils.MappedFrameBuffer(fb) as mfb:\n filename = 'frame-{}-{}-{}.data'.format(ctx['id'], stream_name, ctx['reqs-completed'])\n with open(filename, 'wb') as f:\n for p in mfb.planes:\ndiff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\nindex bff1175b..70bdb7bb 100644\n--- a/src/py/cam/cam_qt.py\n+++ b/src/py/cam/cam_qt.py\n@@ -9,6 +9,7 @@ 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@@ -285,7 +286,7 @@ class MainWindow(QtWidgets.QWidget):\n controlsLayout.addStretch()\n \n def buf_to_qpixmap(self, stream, fb):\n- with fb.mmap() as mfb:\n+ with libcamera.utils.MappedFrameBuffer(fb) as mfb:\n cfg = stream.configuration\n \n if cfg.pixel_format == libcam.formats.MJPEG:\ndiff --git a/src/py/libcamera/__init__.py b/src/py/libcamera/__init__.py\nindex 0d7da9e2..e234a5e4 100644\n--- a/src/py/libcamera/__init__.py\n+++ b/src/py/libcamera/__init__.py\n@@ -2,83 +2,3 @@\n # Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n \n from ._libcamera import *\n-\n-\n-class MappedFrameBuffer:\n- def __init__(self, fb):\n- self.__fb = fb\n-\n- def __enter__(self):\n- import os\n- import mmap\n-\n- fb = self.__fb\n-\n- # Collect information about the buffers\n-\n- bufinfos = {}\n-\n- for i in range(fb.num_planes):\n- fd = fb.fd(i)\n-\n- if fd not in bufinfos:\n- buflen = os.lseek(fd, 0, os.SEEK_END)\n- bufinfos[fd] = {'maplen': 0, 'buflen': buflen}\n- else:\n- buflen = bufinfos[fd]['buflen']\n-\n- if fb.offset(i) > buflen or fb.offset(i) + fb.length(i) > buflen:\n- raise RuntimeError(f'plane is out of buffer: buffer length={buflen}, ' +\n- f'plane offset={fb.offset(i)}, plane length={fb.length(i)}')\n-\n- bufinfos[fd]['maplen'] = max(bufinfos[fd]['maplen'], fb.offset(i) + fb.length(i))\n-\n- # mmap the buffers\n-\n- maps = []\n-\n- for fd, info in bufinfos.items():\n- map = mmap.mmap(fd, info['maplen'], mmap.MAP_SHARED, mmap.PROT_READ | mmap.PROT_WRITE)\n- info['map'] = map\n- maps.append(map)\n-\n- self.__maps = tuple(maps)\n-\n- # Create memoryviews for the planes\n-\n- planes = []\n-\n- for i in range(fb.num_planes):\n- fd = fb.fd(i)\n- info = bufinfos[fd]\n-\n- mv = memoryview(info['map'])\n-\n- start = fb.offset(i)\n- end = fb.offset(i) + fb.length(i)\n-\n- mv = mv[start:end]\n-\n- planes.append(mv)\n-\n- self.__planes = tuple(planes)\n-\n- return self\n-\n- def __exit__(self, exc_type, exc_value, exc_traceback):\n- for p in self.__planes:\n- p.release()\n-\n- for mm in self.__maps:\n- mm.close()\n-\n- @property\n- def planes(self):\n- return self.__planes\n-\n-\n-def __FrameBuffer__mmap(self):\n- return MappedFrameBuffer(self)\n-\n-\n-FrameBuffer.mmap = __FrameBuffer__mmap\ndiff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\nindex 0a7b65f3..b705ac1f 100644\n--- a/src/py/libcamera/meson.build\n+++ b/src/py/libcamera/meson.build\n@@ -72,6 +72,10 @@ run_command('ln', '-fsT', files('__init__.py'),\n meson.current_build_dir() / '__init__.py',\n check: true)\n \n+run_command('ln', '-fsT', meson.current_source_dir() / 'utils',\n+ meson.current_build_dir() / 'utils',\n+ check: true)\n+\n install_data(['__init__.py'], install_dir : destdir)\n \n # \\todo Generate stubs when building. See https://peps.python.org/pep-0484/#stub-files\ndiff --git a/src/py/libcamera/__init__.py b/src/py/libcamera/utils/MappedFrameBuffer.py\nsimilarity index 93%\ncopy from src/py/libcamera/__init__.py\ncopy to src/py/libcamera/utils/MappedFrameBuffer.py\nindex 0d7da9e2..e7dd16ec 100644\n--- a/src/py/libcamera/__init__.py\n+++ b/src/py/libcamera/utils/MappedFrameBuffer.py\n@@ -1,9 +1,6 @@\n # SPDX-License-Identifier: LGPL-2.1-or-later\n # Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n \n-from ._libcamera import *\n-\n-\n class MappedFrameBuffer:\n def __init__(self, fb):\n self.__fb = fb\n@@ -75,10 +72,3 @@ class MappedFrameBuffer:\n @property\n def planes(self):\n return self.__planes\n-\n-\n-def __FrameBuffer__mmap(self):\n- return MappedFrameBuffer(self)\n-\n-\n-FrameBuffer.mmap = __FrameBuffer__mmap\ndiff --git a/src/py/libcamera/utils/__init__.py b/src/py/libcamera/utils/__init__.py\nnew file mode 100644\nindex 00000000..4a23ce36\n--- /dev/null\n+++ b/src/py/libcamera/utils/__init__.py\n@@ -0,0 +1,4 @@\n+# SPDX-License-Identifier: LGPL-2.1-or-later\n+# Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n+\n+from .MappedFrameBuffer import MappedFrameBuffer\n", "prefixes": [ "libcamera-devel", "v3", "07/30" ] }