{"id":12151,"url":"https://patchwork.libcamera.org/api/1.1/patches/12151/?format=json","web_url":"https://patchwork.libcamera.org/patch/12151/","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":"<20210430160026.190724-13-jacopo@jmondi.org>","date":"2021-04-30T16:00:22","name":"[libcamera-devel,v4,12/16] libcamera: raspberrypi: Do not over-write metadata","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5ce20c5cd8ea95b15f3ae3080dd00ee0a77eebcb","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12151/mbox/","series":[{"id":1990,"url":"https://patchwork.libcamera.org/api/1.1/series/1990/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1990","date":"2021-04-30T16:00:10","name":"Support SensorTimestamp metadata","version":4,"mbox":"https://patchwork.libcamera.org/series/1990/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12151/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12151/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 3DEB6BDE4C\n\tfor ;\n\tFri, 30 Apr 2021 16:00:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CC34168924;\n\tFri, 30 Apr 2021 18:00:09 +0200 (CEST)","from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D18C068924\n\tfor ;\n\tFri, 30 Apr 2021 17:59:59 +0200 (CEST)","from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 33A7EFF804;\n\tFri, 30 Apr 2021 15:59:59 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 30 Apr 2021 18:00:22 +0200","Message-Id":"<20210430160026.190724-13-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210430160026.190724-1-jacopo@jmondi.org>","References":"<20210430160026.190724-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 12/16] libcamera: raspberrypi: Do not\n\tover-write metadata","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When a Request is completed upon receiving the IPA produced metadata,\nthe metadata associated with the Request are over-written, deleting\nthe information set at output buffer completion, such as the\nSensorTimestamp.\n\nThis commit applies to the RaspberryPi pipeline handler the same change\napplied to IPU3 in commit 13a7ed7b1f1f (\"libcamera: ipu3: Do not\nover-write metadata\") but compared to that commit it uses the newly\nintroduced ControlList::merge() function.\n\nReviewed-by: Naushir Patuck \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 9 +++++++--\n 1 file changed, 7 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 2a917455500f..46f418aa8d73 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1312,9 +1312,14 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList &\n \n \thandleStreamBuffer(buffer, &isp_[Isp::Stats]);\n \n-\t/* Fill the Request metadata buffer with what the IPA has provided */\n+\t/*\n+\t * Add to the Request metadata buffer what the IPA has provided.\n+\t *\n+\t * Do not overwrite controls set by the pipeline handler, for example\n+\t * SensorTimestamp.\n+\t */\n \tRequest *request = requestQueue_.front();\n-\trequest->metadata() = controls;\n+\trequest->metadata().merge(controls);\n \n \t/*\n \t * Also update the ScalerCrop in the metadata with what we actually\n","prefixes":["libcamera-devel","v4","12/16"]}