[{"id":23087,"web_url":"https://patchwork.libcamera.org/comment/23087/","msgid":"","date":"2022-05-19T10:49:57","subject":"Re: [libcamera-devel] [PATCH 3/5] py: cam: Cleanups","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Tomi,\n\nThank you for the patch.\n\nOn Thu, May 19, 2022 at 01:33:45PM +0300, Tomi Valkeinen wrote:\n> No functional changes.\n\nThat's nearly true, see below.\n\n> Drop unused variables, reduce typechecker\n> warnings.\n> \n> Signed-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(-)\n> \n> diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\n> index 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> \n> diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\n> index 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\nIsn't this one a functional change, and should it be split to a separate\npatch ?\n\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]))\n> diff --git a/src/py/cam/cam_qtgl.py b/src/py/cam/cam_qtgl.py\n> index 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>","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 C7773C3256\n\tfor ;\n\tThu, 19 May 2022 10:50:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1AE8565663;\n\tThu, 19 May 2022 12:50:06 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DE2DC60420\n\tfor ;\n\tThu, 19 May 2022 12:50:04 +0200 (CEST)","from pendragon.ideasonboard.com (unknown [45.131.31.124])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3CCF4A16;\n\tThu, 19 May 2022 12:50:04 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652957406;\n\tbh=3O6VDOP7c1CzHPEVGo9zyTzcQPezATaxEuYhqZHsqqE=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=1PrGq37Asb0wEhOfTAlOYlbT3UUPGQACHA0AmeqYcXZDXOHNeDXwKqL1rr535WQ/z\n\tczeFKH2Zz7TzsNb54yIgt2I+x3nfxJP5uGvIZEvmT7wEXmaRjr1B3IMeHz6OmfC61j\n\tZ0yywBwdbcPGRkGC8ki7J6JGV7dYazpLGehuy/DMK+HF8UdHOS4mXg+4ORyyV7sUMG\n\tw9UN+uCdzSfiawN3frIdajQw4Q3Tcy39QCgUAR2mIqckoULgGRzpB23gFBn+oy2x4Q\n\tOgn2cWVBzzBAiGbRG+CLVmMtZlkQ1jIKn+gLZzA8UxqbqV0LAr7vGFqNCyCpcKU2fa\n\t+gIO7djrN/Lfw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652957404;\n\tbh=3O6VDOP7c1CzHPEVGo9zyTzcQPezATaxEuYhqZHsqqE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=kjAJkRZvMg+/taNSZPGmItaTABuNFU3FrXpJl9NTPGRQHmMADObSTUmeYrUizY8n7\n\tVhXgvqVTACG9LCiqpr/sEPyzTRqQhsVjVTsDydr0Cl0diyQq9F2PX/a5ZuY7qveoqS\n\tlu/z/3+LAnKqgkDa9er5wFqSuTT04qJvbSuFxLkA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"kjAJkRZv\"; dkim-atps=neutral","Date":"Thu, 19 May 2022 13:49:57 +0300","To":"Tomi Valkeinen ","Message-ID":"","References":"<20220519103347.33295-1-tomi.valkeinen@ideasonboard.com>\n\t<20220519103347.33295-4-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220519103347.33295-4-tomi.valkeinen@ideasonboard.com>","Subject":"Re: [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":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23089,"web_url":"https://patchwork.libcamera.org/comment/23089/","msgid":"","date":"2022-05-19T10:51:51","subject":"Re: [libcamera-devel] [PATCH 3/5] py: cam: Cleanups","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/people/109/","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"content":"On 19/05/2022 13:49, Laurent Pinchart wrote:\n> Hi Tomi,\n> \n> Thank you for the patch.\n> \n> On Thu, May 19, 2022 at 01:33:45PM +0300, Tomi Valkeinen wrote:\n>> No functional changes.\n> \n> That's nearly true, see below.\n> \n>> Drop unused variables, reduce typechecker\n>> warnings.\n>>\n>> Signed-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(-)\n>>\n>> diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\n>> index 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>> \n>> diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\n>> index 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> \n> Isn't this one a functional change, and should it be split to a separate\n> patch ?\n\nYou're right, I missed that. I added WA_ShowWithoutActivating for \ndebugging purposes at some point long time back, but then forgot to \nremove it.\n\nI can separate it from this one.\n\n Tomi","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 07B0BC0F2A\n\tfor ;\n\tThu, 19 May 2022 10:51:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B44DC65663;\n\tThu, 19 May 2022 12:51:55 +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 9E80360420\n\tfor ;\n\tThu, 19 May 2022 12:51:54 +0200 (CEST)","from [192.168.1.111] (91-156-85-209.elisa-laajakaista.fi\n\t[91.156.85.209])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1D136E50;\n\tThu, 19 May 2022 12:51:54 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652957515;\n\tbh=jHkhqwA2H79J99ctuSheMpG27dLiBII2dfBmKt49p4A=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=p3rhRiKSY6UF9o2hS+pxsLbiX64Lg4nj2CrosAFC0VP7YcMlrmV8lUhXuERrH+bWQ\n\tev3y7AvajLyiqyPu/P881cnuIkvwEav41Mnw297GOhPAZaQSSgQftlkup1MIiSqfoi\n\tra7kbmeFOsr/n8tZTBS8yRla64ZFqrpp9Ow7UZvf/NLVuC6OF8dSbdIVw6JiGUPE8a\n\tLm86d4fBAa9nfOP40QA3YbOUfVEhsQdKZBlKoMzQrkcLvn1ZlktMXLPeInWLu8Sz3i\n\tz75IWOBNtFdxf9/4A3MVSdcyWYP85duKz9EVaTHqXzEimMGCdQaZ8isHnw30r1ZxsL\n\tZVhXdMvRy9syg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652957514;\n\tbh=jHkhqwA2H79J99ctuSheMpG27dLiBII2dfBmKt49p4A=;\n\th=Date:Subject:To:Cc:References:From:In-Reply-To:From;\n\tb=ARJ+gFaV35JvPctoA/Kz/gig9+/8385BvtdlquO15JbNNJd/yRNpAlKR0ZEIKf4b+\n\th8MsYjfySrXV+bQ+h+Pjd6AF+LgkYzttbNJPOAnylDWhlnOcAL0m8qD47naxbQvIl8\n\tyh/uWOs5WkLCOkketWN9QSO+T7C5ROTsvfLf+wfw="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ARJ+gFaV\"; dkim-atps=neutral","Message-ID":"","Date":"Thu, 19 May 2022 13:51:51 +0300","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101\n\tThunderbird/91.8.0","Content-Language":"en-US","To":"Laurent Pinchart ","References":"<20220519103347.33295-1-tomi.valkeinen@ideasonboard.com>\n\t<20220519103347.33295-4-tomi.valkeinen@ideasonboard.com>\n\t","In-Reply-To":"","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","Subject":"Re: [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 ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23091,"web_url":"https://patchwork.libcamera.org/comment/23091/","msgid":"","date":"2022-05-19T10:53:21","subject":"Re: [libcamera-devel] [PATCH 3/5] py: cam: Cleanups","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Thu, May 19, 2022 at 01:51:51PM +0300, Tomi Valkeinen wrote:\n> On 19/05/2022 13:49, Laurent Pinchart wrote:\n> > On Thu, May 19, 2022 at 01:33:45PM +0300, Tomi Valkeinen wrote:\n> >> No functional changes.\n> > \n> > That's nearly true, see below.\n> > \n> >> Drop unused variables, reduce typechecker\n> >> warnings.\n> >>\n> >> Signed-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(-)\n> >>\n> >> diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\n> >> index 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> >> \n> >> diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py\n> >> index 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> > \n> > Isn't this one a functional change, and should it be split to a separate\n> > patch ?\n> \n> You're right, I missed that. I added WA_ShowWithoutActivating for \n> debugging purposes at some point long time back, but then forgot to \n> remove it.\n> \n> I can separate it from this one.\n\nI'll drop that line from this patch, no need to resubmit, you can then\nsend another one on top.","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 EE3E6C0F2A\n\tfor ;\n\tThu, 19 May 2022 10:53:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9E86F65663;\n\tThu, 19 May 2022 12:53: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 79BD060420\n\tfor ;\n\tThu, 19 May 2022 12:53:28 +0200 (CEST)","from pendragon.ideasonboard.com (unknown [45.131.31.124])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F3A8DA16;\n\tThu, 19 May 2022 12:53:27 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652957610;\n\tbh=5thTgiVX5W4CakoJ2ANAv+3ZZP4U3CvAybwFkWHgBFw=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=gi9qgkAUwhll9QDmo/ZKhSJERUEYJV3ICzlAAh9y/xlufDCPJMGq6bXIR/8bJ5B7q\n\tRfpZd1gavZ1HLNrHPrzqG6ZJ2RIH/M6QkVltMUxU601ToHLk7dm846SzLykTuRtTUG\n\tCqAo02h1T8ebeNtcn8UDl20K4R3UE2ZTfvfLTooMo4wa/zQITBRXyKwex2oaOkw/FW\n\t2a/JBwDf6twgKdbUaWo+I4eU5dQrXymuL3J4JZuc6na+BAkki8vhg9uCVB/lgg8mnG\n\tMrNnGLQ1ZVyot3NndZtSrLoxxZMX6a7OkNjuzhWlZay5TgOjqjfKQFBBmttJiUsVh3\n\tG119BPV6HP8KQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652957608;\n\tbh=5thTgiVX5W4CakoJ2ANAv+3ZZP4U3CvAybwFkWHgBFw=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=tF12yZsTQ0T60xRAglqzWH5uhoJSCh7HWRyPqJGZT3vc0ui0xHKAydiqcag+0ULbc\n\twdi5/I6um+8lUrgwmc409CdKZkV/SjnCHdaPF1ldmm4oAGu1M8gqqV3ZXFuUi4syqr\n\tCog8/KIGg4QV4nqjgRYmmGhXDAY/qAQ/6RXu4Te4="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"tF12yZsT\"; dkim-atps=neutral","Date":"Thu, 19 May 2022 13:53:21 +0300","To":"Tomi Valkeinen ","Message-ID":"","References":"<20220519103347.33295-1-tomi.valkeinen@ideasonboard.com>\n\t<20220519103347.33295-4-tomi.valkeinen@ideasonboard.com>\n\t\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [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":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]