{"id":12043,"url":"https://patchwork.libcamera.org/api/patches/12043/?format=json","web_url":"https://patchwork.libcamera.org/patch/12043/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210421160319.42251-13-jacopo@jmondi.org>","date":"2021-04-21T16:03:15","name":"[libcamera-devel,v3,12/16] libcamera: raspberrypi: Do not over-write metadata","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"38642f82b9c3c23abfff5c6d322e7a4ed1944f1c","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/12043/mbox/","series":[{"id":1957,"url":"https://patchwork.libcamera.org/api/series/1957/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1957","date":"2021-04-21T16:03:03","name":"Support SensorTimestamp metadata","version":3,"mbox":"https://patchwork.libcamera.org/series/1957/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12043/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12043/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 6C762BDB17\n\tfor ;\n\tWed, 21 Apr 2021 16:02:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 21C7568851;\n\tWed, 21 Apr 2021 18:02:59 +0200 (CEST)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 991726884A\n\tfor ;\n\tWed, 21 Apr 2021 18:02:51 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id DE16D240003;\n\tWed, 21 Apr 2021 16:02:50 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 21 Apr 2021 18:03:15 +0200","Message-Id":"<20210421160319.42251-13-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210421160319.42251-1-jacopo@jmondi.org>","References":"<20210421160319.42251-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 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..6c6d31f78c88 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(const_cast(controls));\n \n \t/*\n \t * Also update the ScalerCrop in the metadata with what we actually\n","prefixes":["libcamera-devel","v3","12/16"]}