{"id":15985,"url":"https://patchwork.libcamera.org/api/1.1/patches/15985/?format=json","web_url":"https://patchwork.libcamera.org/patch/15985/","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":"<20220519103347.33295-4-tomi.valkeinen@ideasonboard.com>","date":"2022-05-19T10:33:45","name":"[libcamera-devel,3/5] py: cam: Cleanups","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"cf6e7312c59ede74b6a8abe498ac4b166cc32526","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/15985/mbox/","series":[{"id":3127,"url":"https://patchwork.libcamera.org/api/1.1/series/3127/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3127","date":"2022-05-19T10:33:42","name":"More misc Python patches","version":1,"mbox":"https://patchwork.libcamera.org/series/3127/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15985/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15985/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 A5421C326C\n\tfor ;\n\tThu, 19 May 2022 10:34:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1C64E65667;\n\tThu, 19 May 2022 12:34:11 +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 F40EC60420\n\tfor ;\n\tThu, 19 May 2022 12:34:07 +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 6E64CE53;\n\tThu, 19 May 2022 12:34:07 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652956451;\n\tbh=K0Zv9bI44iCQj0lfB8y7MwuuVF7GVni5p82HCXe4F9I=;\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=yudXtiWLSxVvWfs0yZDNJuKnyl2PFihBZ7erPXUZ8AXPUuKa5XiSwGb/ex3JK5ZQB\n\t21tiW7RHY4dofzLI6n7uEnJdQSU9xYJUz8ampx42vwzw1DcQUVfVNH2Nmgsxw6REbb\n\tvxXcMAEtzOnvNif6KvbLFgEY2C7vh2sUkf7AZ43bQzR1evw40nRa9KN2vC2OgbNbEj\n\tQLJHQixar8gV4XotdWUAhAwo61qWvDDdV6YFYJgVRiAyLxvOV8bfLRBQ3FdWNpkQ9u\n\tvjwP4kQiNMfkdX+6CfJB654fdXpdWyDnOQf321VUyu9Fp0dDSn2fn5DBmglojgXm27\n\t0LPelGq94ranQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652956447;\n\tbh=K0Zv9bI44iCQj0lfB8y7MwuuVF7GVni5p82HCXe4F9I=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=gm79lZly/UAqe/C+fhBIH1QLanc5777Sa8biqyD0S0/H1PQu8yXOyi8QFRyCb6rAu\n\tPjDtJpeS3ElfJNybb/jcNSizVKMhogcw1jsA2KS1bfBcSsXbmV5rDZzfEDFIl/9oK9\n\tFX1ERP9cNOIOAM4IngFJDw+o+Mr7y0dgS2Bt4+oQ="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"gm79lZly\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tJacopo Mondi ","Date":"Thu, 19 May 2022 13:33:45 +0300","Message-Id":"<20220519103347.33295-4-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220519103347.33295-1-tomi.valkeinen@ideasonboard.com>","References":"<20220519103347.33295-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/5] py: cam: Cleanups","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":"No functional changes. Drop unused variables, reduce typechecker\nwarnings.\n\nSigned-off-by: Tomi Valkeinen \n---\n src/py/cam/cam.py | 2 +-\n src/py/cam/cam_qt.py | 13 ++-----------\n src/py/cam/cam_qtgl.py | 9 ++-------\n 3 files changed, 5 insertions(+), 19 deletions(-)","diff":"diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\nindex 2f0690b5..e2bc78da 100755\n--- a/src/py/cam/cam.py\n+++ b/src/py/cam/cam.py\n@@ -304,7 +304,7 @@ def event_handler(state):\n \n running = any(ctx['reqs-completed'] < ctx['opt-capture'] for ctx in contexts)\n return running\n- except Exception as e:\n+ except Exception:\n traceback.print_exc()\n return False\n \ndiff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\nindex 0a25a823..8dc6f92e 100644\n--- a/src/py/cam/cam_qt.py\n+++ b/src/py/cam/cam_qt.py\n@@ -184,14 +184,8 @@ class QtRenderer:\n windows = []\n \n for ctx in self.contexts:\n- camera = ctx['camera']\n-\n for stream in ctx['streams']:\n- fmt = stream.configuration.pixel_format\n- size = stream.configuration.size\n-\n window = MainWindow(ctx, stream)\n- window.setAttribute(QtCore.Qt.WA_ShowWithoutActivating)\n window.show()\n windows.append(window)\n \n@@ -199,10 +193,10 @@ class QtRenderer:\n \n def run(self):\n camnotif = QtCore.QSocketNotifier(self.cm.efd, QtCore.QSocketNotifier.Read)\n- camnotif.activated.connect(lambda x: self.readcam())\n+ camnotif.activated.connect(lambda _: self.readcam())\n \n keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)\n- keynotif.activated.connect(lambda x: self.readkey())\n+ keynotif.activated.connect(lambda _: self.readkey())\n \n print('Capturing...')\n \n@@ -292,9 +286,6 @@ class MainWindow(QtWidgets.QWidget):\n def buf_to_qpixmap(self, stream, fb):\n with fb.mmap() as mfb:\n cfg = stream.configuration\n- w = cfg.size.width\n- h = cfg.size.height\n- pitch = cfg.stride\n \n if cfg.pixel_format == libcam.formats.MJPEG:\n img = Image.open(BytesIO(mfb.planes[0]))\ndiff --git a/src/py/cam/cam_qtgl.py b/src/py/cam/cam_qtgl.py\nindex 4bbcda6c..3fb7dde3 100644\n--- a/src/py/cam/cam_qtgl.py\n+++ b/src/py/cam/cam_qtgl.py\n@@ -5,16 +5,11 @@ from PyQt5 import QtCore, QtWidgets\n from PyQt5.QtCore import Qt\n \n import math\n-import numpy as np\n import os\n import sys\n \n os.environ['PYOPENGL_PLATFORM'] = 'egl'\n \n-import OpenGL\n-# OpenGL.FULL_LOGGING = True\n-\n-from OpenGL import GL as gl\n from OpenGL.EGL.EXT.image_dma_buf_import import *\n from OpenGL.EGL.KHR.image import *\n from OpenGL.EGL.VERSION.EGL_1_0 import *\n@@ -149,10 +144,10 @@ class QtRenderer:\n \n def run(self):\n camnotif = QtCore.QSocketNotifier(self.state['cm'].efd, QtCore.QSocketNotifier.Read)\n- camnotif.activated.connect(lambda x: self.readcam())\n+ camnotif.activated.connect(lambda _: self.readcam())\n \n keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)\n- keynotif.activated.connect(lambda x: self.readkey())\n+ keynotif.activated.connect(lambda _: self.readkey())\n \n print('Capturing...')\n \n","prefixes":["libcamera-devel","3/5"]}