{"id":12177,"url":"https://patchwork.libcamera.org/api/1.1/patches/12177/?format=json","web_url":"https://patchwork.libcamera.org/patch/12177/","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":"<20210503104152.34048-9-jacopo@jmondi.org>","date":"2021-05-03T10:41:43","name":"[libcamera-devel,v5,08/17] libcamera: rkisp1: Do not over-write metadata","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"95c3fa8bc0d6180f16bf4ec09ff26ef27cd38ed6","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/12177/mbox/","series":[{"id":1994,"url":"https://patchwork.libcamera.org/api/1.1/series/1994/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1994","date":"2021-05-03T10:41:35","name":"Support SensorTimestamp metadata","version":5,"mbox":"https://patchwork.libcamera.org/series/1994/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12177/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12177/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 50A89BDE78\n\tfor ;\n\tMon, 3 May 2021 10:41:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B2FCD68937;\n\tMon, 3 May 2021 12:41:18 +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 CC82760511\n\tfor ;\n\tMon, 3 May 2021 12:41:14 +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 relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 9AACFFF802\n\tfor ;\n\tMon, 3 May 2021 10:41:14 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 3 May 2021 12:41:43 +0200","Message-Id":"<20210503104152.34048-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210503104152.34048-1-jacopo@jmondi.org>","References":"<20210503104152.34048-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 08/17] 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":"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 RkISP1 pipeline handler the same change\napplied to IPU3 in commit 2ee3dd57e2fc (\"libcamera: ipu3: Merge IPA\nmetadata controls\").\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex c75666391222..26f708242523 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -365,7 +365,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->metadata() = metadata;\n+\tinfo->request->metadata().merge(metadata);\n \tinfo->metadataProcessed = true;\n \n \tpipe->tryCompleteRequest(info->request);\n","prefixes":["libcamera-devel","v5","08/17"]}