From patchwork Thu Jan 12 17:34:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Oakley X-Patchwork-Id: 18106 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 33FB4C3292 for ; Thu, 12 Jan 2023 17:39:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 89B55625E4; Thu, 12 Jan 2023 18:39:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1673545184; bh=6t3gqeqQGiUWzbLgFcbAcyeqVFnoYvBhwqfB9zvgsiM=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=NrSue/2wTuCOQ53rNHpJxKsq9aWyATb8YVqwPb2jxwtZGmzwOqfbymmjfiZPoPKp6 DNDSUrFZ/6M+cRt7rITvpbraXamqTZsJWEuSZo2E+Bqdd+Wqp1BSuetEbhvIlzVPJK Zc6agD/NWxQJT/+vdbb9XWp187mqvvOvJ3IUpt03X2zAjnoWJklXJNm1pTc+54hBeh rRMN3KXBzylUulxmJvZkSl0WT46YoIi4AR/8WKuckaDq5xq4jeonZJYZrAgssxXjLv bOfkX9hHDyrQNCcAqVIV7ggLjKxkGcIg9RBZaNcFHiKNWhKwHlC7YxLO1zO0p2OQyu r3E4Os23UV8Zw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D214361F04 for ; Thu, 12 Jan 2023 18:34:50 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="AJGkkNL3"; dkim-atps=neutral Received: from danielLaptop.tendawifi.com (unknown [90.242.103.36]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 061E3492; Thu, 12 Jan 2023 18:34:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1673544890; bh=6t3gqeqQGiUWzbLgFcbAcyeqVFnoYvBhwqfB9zvgsiM=; h=From:To:Cc:Subject:Date:From; b=AJGkkNL3NdiVOkGpZsCsSabT9HhaW5Vfc8KP3srmJ5DriVhYyG7XPDZT9S2UCrKQM i+fJJB1Pmlo8sqcXW4fjtZ2mh1EPJOo8ep79Wn1Ic8H++tLyRKJ2mdFjogWn7r4Rjp SCpRvSJGnuQV/3A77891W9zxFjK/pW+vQtLTEpB8= To: libcamera-devel@lists.libcamera.org Date: Thu, 12 Jan 2023 17:34:11 +0000 Message-Id: <20230112173411.11276-1-daniel.oakley@ideasonboard.com> X-Mailer: git-send-email 2.38.2 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 12 Jan 2023 18:39:43 +0100 Subject: [libcamera-devel] [PATCH] py: cam.py: Fix duplicate metadata output if more than one steam X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Daniel Oakley via libcamera-devel From: Daniel Oakley Reply-To: Daniel Oakley Cc: Daniel Oakley Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Currently, if there are multiple steams, the --metadata flag will print the metadata for each request multiple times. Moving the metadata print logic outside the steam for loop this will no longer occur. Signed-off-by: Daniel Oakley Reviewed-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart --- src/py/cam/cam.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py index 2701d937..967a72f5 100755 --- a/src/py/cam/cam.py +++ b/src/py/cam/cam.py @@ -266,6 +266,11 @@ class CaptureState: ctx.last = ts ctx.fps = fps + if ctx.opt_metadata: + reqmeta = req.metadata + for ctrl, val in reqmeta.items(): + print(f'\t{ctrl} = {val}') + for stream, fb in buffers.items(): stream_name = ctx.stream_names[stream] @@ -284,11 +289,6 @@ class CaptureState: '/'.join([str(p.bytes_used) for p in meta.planes]), crcs)) - if ctx.opt_metadata: - reqmeta = req.metadata - for ctrl, val in reqmeta.items(): - print(f'\t{ctrl} = {val}') - if ctx.opt_save_frames: with libcamera.utils.MappedFrameBuffer(fb) as mfb: filename = 'frame-{}-{}-{}.data'.format(ctx.id, stream_name, ctx.reqs_completed)