{"id":11986,"url":"https://patchwork.libcamera.org/api/patches/11986/?format=json","web_url":"https://patchwork.libcamera.org/patch/11986/","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":"<20210419131433.22920-5-jacopo@jmondi.org>","date":"2021-04-19T13:14:24","name":"[libcamera-devel,04/13] libcamera: rkisp1: Do not over-write metadata","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7d6efcf659ba3d472e2e0456e630e6106c7bcf7d","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/11986/mbox/","series":[{"id":1948,"url":"https://patchwork.libcamera.org/api/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/11986/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11986/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 BC7EABD814\n\tfor ;\n\tMon, 19 Apr 2021 13:14:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 404E968845;\n\tMon, 19 Apr 2021 15:14:23 +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 1C81B6882F\n\tfor ;\n\tMon, 19 Apr 2021 15:14:20 +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 5A1FE10000A;\n\tMon, 19 Apr 2021 13:14:19 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 19 Apr 2021 15:14:24 +0200","Message-Id":"<20210419131433.22920-5-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 04/13] libcamera: rkisp1: 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 RkISP1 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\nFixes: 0eb65e14e18d (\"libcamera: pipeline: rkisp1: Attach to an IPA\")\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 549f4a4e61a8..925c8c6372e0 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -362,7 +362,9 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->metadata() = metadata;\n+\tfor (const auto &ctrl : metadata)\n+\t\tinfo->request->metadata().set(ctrl.first, ctrl.second);\n+\n \tinfo->metadataProcessed = true;\n \n \tpipe->tryCompleteRequest(info->request);\n","prefixes":["libcamera-devel","04/13"]}