Patch Detail
Show a patch.
GET /api/patches/16111/?format=api
{ "id": 16111, "url": "https://patchwork.libcamera.org/api/patches/16111/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16111/", "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": "<20220530142722.57618-5-tomi.valkeinen@ideasonboard.com>", "date": "2022-05-30T14:27:10", "name": "[libcamera-devel,v4,04/16] py: cam: Drop PIL dependency", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "57f297d52f2e10883fb35f701494976c6c24179e", "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/16111/mbox/", "series": [ { "id": 3149, "url": "https://patchwork.libcamera.org/api/series/3149/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3149", "date": "2022-05-30T14:27:06", "name": "More misc Python patches", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3149/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16111/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16111/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 090CBC326F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 30 May 2022 14:27:47 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 308ED6564F;\n\tMon, 30 May 2022 16:27:47 +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 48C066563B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 30 May 2022 16:27:41 +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 B5343F95;\n\tMon, 30 May 2022 16:27:40 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653920867;\n\tbh=1AFq90Ktt2OqgK4q7nRfejvXrZdM2ryLizgojc4jWLY=;\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=xt/kD7iqCQW6ylsdh/jKZwl/z9X+h+n+xll1SB6rnpts+kFyyBHEj2DPc1MABp9xp\n\tq1bhSTwXxF2XZCXtAuxr+09QtnVrJzPe+nHarM4cOLaBuSZSLSJ24guIZPZtVycVmV\n\tnQzmnlZ21YWDmnZ0yhQVzo/cn5YkhGV4ASDJ4KFva/D1UUKf1+TvVoPkLkMQ/SFnmW\n\tx1kzX2uYLW+oh8k6X3wuHR7LYlKSJb7jjWHT/sq16gzhpreKiyE0wkZnDkOiYerDGw\n\tST5y4vOwN0D449Exkk4rySvnOYpVXkJKAT4wIsVX5q+pp3PmX4uGIYFmUM+r9rBd0D\n\tLTqrllwKe3oTw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653920861;\n\tbh=1AFq90Ktt2OqgK4q7nRfejvXrZdM2ryLizgojc4jWLY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ju5CRlAWRbzfO6WCN47nynQ5U3IOR9NMlvxUMpqgak9wu2Vtrkxlyj0t0q7AWtiO4\n\tfQ4IIGLc4pKqFME5LTfGKeyTG1ca7WQv8CF7YVok4xbEMcrJDBjx8zdTTHZABBO9lg\n\tCqaKHWr4+vVdPlwra1KRIlFEg8XK/nN7rOZZhgfQ=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ju5CRlAW\"; 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": "Mon, 30 May 2022 17:27:10 +0300", "Message-Id": "<20220530142722.57618-5-tomi.valkeinen@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220530142722.57618-1-tomi.valkeinen@ideasonboard.com>", "References": "<20220530142722.57618-1-tomi.valkeinen@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 04/16] py: cam: Drop PIL dependency", "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": "We can use Qt directly to accomplish the same as we do with PIL.\n\nA minor downside is that loading MJPEG frame with Qt produces a \"Corrupt\nJPEG data\" warning. The resulting picture looks fine, though. So add a\nmessage handler to ignore that warning.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/py/cam/cam_qt.py | 29 +++++++++++++++++++++--------\n 1 file changed, 21 insertions(+), 8 deletions(-)", "diff": "diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\nindex 61a77f45..b6412bdf 100644\n--- a/src/py/cam/cam_qt.py\n+++ b/src/py/cam/cam_qt.py\n@@ -2,18 +2,32 @@\n # Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n \n from helpers import mfb_to_rgb\n-from io import BytesIO\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 sys\n \n \n+# Loading MJPEG to a QPixmap produces corrupt JPEG data warnings. Ignore these.\n+def qt_message_handler(msg_type, msg_log_context, msg_string):\n+ if msg_string.startswith(\"Corrupt JPEG data\"):\n+ return\n+\n+ # For some reason qInstallMessageHandler returns None, so we won't\n+ # call the old handler\n+ if old_msg_handler is not None:\n+ old_msg_handler(msg_type, msg_log_context, msg_string)\n+ else:\n+ print(msg_string)\n+\n+\n+old_msg_handler = QtCore.qInstallMessageHandler(qt_message_handler)\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+ w = rgb.shape[1]\n+ h = rgb.shape[0]\n+ qim = QtGui.QImage(rgb, w, h, QtGui.QImage.Format.Format_RGB888)\n pix = QtGui.QPixmap.fromImage(qim)\n return pix\n \n@@ -136,9 +150,8 @@ class MainWindow(QtWidgets.QWidget):\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+ pix = QtGui.QPixmap(cfg.size.width, cfg.size.height)\n+ pix.loadFromData(mfb.planes[0])\n else:\n rgb = mfb_to_rgb(mfb, cfg)\n if rgb is None:\n", "prefixes": [ "libcamera-devel", "v4", "04/16" ] }