{"id":11991,"url":"https://patchwork.libcamera.org/api/1.1/patches/11991/?format=json","web_url":"https://patchwork.libcamera.org/patch/11991/","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":"<20210419131433.22920-10-jacopo@jmondi.org>","date":"2021-04-19T13:14:29","name":"[libcamera-devel,09/13] libcamera: raspberrypi: Do not over-write metadata","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5579e8eb8bf648a4652045f85bc3f1e1e9cb667d","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/11991/mbox/","series":[{"id":1948,"url":"https://patchwork.libcamera.org/api/1.1/series/1948/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1948","date":"2021-04-19T13:14:20","name":"Support SensorTimestamp metadata","version":1,"mbox":"https://patchwork.libcamera.org/series/1948/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11991/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11991/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 AC214BD814\n\tfor ;\n\tMon, 19 Apr 2021 13:14:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 710E768835;\n\tMon, 19 Apr 2021 15:14:29 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D338E68839\n\tfor ;\n\tMon, 19 Apr 2021 15:14:22 +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 relay11.mail.gandi.net (Postfix) with ESMTPSA id 6E69610001E;\n\tMon, 19 Apr 2021 13:14:22 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 19 Apr 2021 15:14:29 +0200","Message-Id":"<20210419131433.22920-10-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210419131433.22920-1-jacopo@jmondi.org>","References":"<20210419131433.22920-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 09/13] 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":"This commit applies to the RaspberryPi pipeline handler the same change\napplied to IPU3 in commit 13a7ed7b1f1f (\"libcamera: ipu3: Do not\nover-write metadata\").\n\nWhen 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\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 10 ++++++++--\n 1 file changed, 8 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex f22e286ed87a..d1902bfc3393 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1312,9 +1312,15 @@ 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, in example\n+\t * SensorTimestamp.\n+\t */\n \tRequest *request = requestQueue_.front();\n-\trequest->metadata() = controls;\n+\tfor (const auto &ctrl : controls)\n+\t\trequest->metadata().set(ctrl.first, ctrl.second);\n \n \t/*\n \t * Also update the ScalerCrop in the metadata with what we actually\n","prefixes":["libcamera-devel","09/13"]}