{"id":16091,"url":"https://patchwork.libcamera.org/api/1.1/patches/16091/?format=json","web_url":"https://patchwork.libcamera.org/patch/16091/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","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-21-tomi.valkeinen@ideasonboard.com>","date":"2022-05-27T14:44:37","name":"[libcamera-devel,v3,20/30] py: cam: Drop PIL dependency","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1b1955934cc5c8f6b5613c3d62455b9dbe643956","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/1.1/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16091/mbox/","series":[{"id":3146,"url":"https://patchwork.libcamera.org/api/1.1/series/3146/?format=json","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/16091/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16091/checks/","tags":{},"headers":{"Return-Path":"","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 7D236C326D\n\tfor ;\n\tFri, 27 May 2022 14:45:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 24A0F6563F;\n\tFri, 27 May 2022 16:45:34 +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 C9483633A3\n\tfor ;\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 3FB7E4326;\n\tFri, 27 May 2022 16:45:14 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653662734;\n\tbh=fOxQi3MV/7Kaw5ML4agaGNJFUHdB1JvWz5wxvrcHCjE=;\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=CZPoipOVKsA9HQB8wQ2GPWkIp43CUrhOyJN4jp9TWKZ4yeIK66367N5MrFHmW1RED\n\tZV86xqosPRAgykNlAoM5xZwDyXGUcEZGOYOP+lWN02JncB7gz0LFNJCtysNQ7SZy2T\n\tcWlSv1ZUMH2AK9SNsBEVOOYoLLLfJthl1jPDbsWw0dqTnbgOely8twaeRpYXXMxeNm\n\tuYF+D9I/cGkGPwvX9fkjA58IKsat51F/+2+R9QcL4did7gSDIU7PhhstS+rQ5zNPXb\n\taA4/uBzhiwCJJY7FXBg9NNIHHktLO5shtBRsdYyLfCAC4w4TaZi69uEeNybLjQjG8l\n\tk4UkmKRBMJwgg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653662714;\n\tbh=fOxQi3MV/7Kaw5ML4agaGNJFUHdB1JvWz5wxvrcHCjE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=OJHlm/EBi+Zb1TZ/STmCJqJ+7LyonVjhNyCGqXhXS1pyD5SNBkcZsic+6rPIeLSzv\n\t+TvBdnvEhxY7FsM8z8q91JdowD0uIqT2X5dHQYnu6B/xcQMtZ6lfYJa9TTyt/tvvhh\n\tB/6x3eE+BcLFlqInsWQB4S1znh7iLcMCnRIv1FvQ="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"OJHlm/EB\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tJacopo Mondi ","Date":"Fri, 27 May 2022 17:44:37 +0300","Message-Id":"<20220527144447.94891-21-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 20/30] py: cam: Drop PIL dependency","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Tomi Valkeinen via libcamera-devel\n\t","Reply-To":"Tomi Valkeinen ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \n---\n src/py/cam/cam_qt.py | 30 ++++++++++++++++++++++--------\n 1 file changed, 22 insertions(+), 8 deletions(-)","diff":"diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\nindex af4b0f86..b6412bdf 100644\n--- a/src/py/cam/cam_qt.py\n+++ b/src/py/cam/cam_qt.py\n@@ -2,17 +2,32 @@\n # Copyright (C) 2022, Tomi Valkeinen \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@@ -135,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","v3","20/30"]}