[{"id":16705,"web_url":"https://patchwork.libcamera.org/comment/16705/","msgid":"<e3135d9e-c7da-c855-0582-9990566e5391@ideasonboard.com>","date":"2021-04-30T19:06:06","subject":"Re: [libcamera-devel] [PATCH v4 07/16] libcamera: rkisp1: Do not\n\tover-write metadata","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 30/04/2021 17:00, Jacopo Mondi wrote:\n> When a Request is completed upon receiving the IPA produced metadata,\n> the metadata associated with the Request are over-written, deleting\n> the information set at output buffer completion, such as the\n> SensorTimestamp.\n> \n> This commit applies to the RkISP1 pipeline handler the same change\n> applied to IPU3 in commit 13a7ed7b1f1f (\"libcamera: ipu3: Do not\n> over-write metadata\") but compared to that commit it uses the newly\n> introduced ControlList::merge() function.\n\nLooks much better to me ;-)\nI'm sure the documentation updates in 01/16 will get sorted, and this is\nmore self-documenting so:\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 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>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 42081BDE4D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 30 Apr 2021 19:06:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E3CB768901;\n\tFri, 30 Apr 2021 21:06:10 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 12C80688A5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Apr 2021 21:06:09 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A72D645F;\n\tFri, 30 Apr 2021 21:06:08 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"VviynhcO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619809568;\n\tbh=frcMT+K94bUXsvB1a/TjayfVaY9Wyxyo2E6LPnPvhZc=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=VviynhcO60agOMxM24idgs0Gbwj2RmSTyodBK5Pc3H6bcbY/HV89vGp9uIl+saFlN\n\tZNwu8wcaLC8FR6ob2ONSUF7A5tnh98g3TC09voN4gN3jCxPFVkFNFoBV5sjncj6n6U\n\tuI7w2wkEkDegCo8NyaayU6TPArYu6o4ha5yCxUoQ=","To":"Jacopo Mondi <jacopo@jmondi.org>, libcamera-devel@lists.libcamera.org","References":"<20210430160026.190724-1-jacopo@jmondi.org>\n\t<20210430160026.190724-8-jacopo@jmondi.org>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Organization":"Ideas on Board","Message-ID":"<e3135d9e-c7da-c855-0582-9990566e5391@ideasonboard.com>","Date":"Fri, 30 Apr 2021 20:06:06 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.7.1","MIME-Version":"1.0","In-Reply-To":"<20210430160026.190724-8-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v4 07/16] 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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":16706,"web_url":"https://patchwork.libcamera.org/comment/16706/","msgid":"<7d8a75ca-ca66-43e1-57e9-86fde85e927b@ideasonboard.com>","date":"2021-04-30T19:10:40","subject":"Re: [libcamera-devel] [PATCH v4 07/16] libcamera: rkisp1: Do not\n\tover-write metadata","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 30/04/2021 17:00, Jacopo Mondi wrote:\n> When a Request is completed upon receiving the IPA produced metadata,\n> the metadata associated with the Request are over-written, deleting\n> the information set at output buffer completion, such as the\n> SensorTimestamp.\n> \n> This commit applies to the RkISP1 pipeline handler the same change\n> applied to IPU3 in commit 13a7ed7b1f1f (\"libcamera: ipu3: Do not\n> over-write metadata\") but compared to that commit it uses the newly\n> introduced ControlList::merge() function.\n\nIt sounds like 13a7ed7b1f1f (\"libcamera: ipu3: Do not over-write\nmetadata\") has added a todo which was waiting for a .merge() to become\navailable to solve this in the same way.\n\nWith this series adding the .merge() Can/Should we update the IPU3 in\nthe same way either as an extra patch on this series or make sure we do\nit on top?\n\n--\nKieran\n\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 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>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 5EC7FBDE4F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 30 Apr 2021 19:10:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C66706890E;\n\tFri, 30 Apr 2021 21:10:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4B943688A5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Apr 2021 21:10:43 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1F3B4547;\n\tFri, 30 Apr 2021 21:10:42 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"jsAkqhiS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619809842;\n\tbh=F4FRaZ8VHdrzOhArohDu0TS7jcMv+pHYOjT9bReru2w=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=jsAkqhiSfDQdAg0L3x1X6AtbH/zWdktnR91t7hsX/+h/iiNm6BxOVbJRKIR7av/O8\n\tsTkcS3UNDAFS7lrxCQ8WYCJch+n8/a42qbacxuCY46pUQlTRDXnbSe58sBcNb/S3vJ\n\tp7xzeTboVJ57Mb17fPXNIkeSdCPRUnCwDC/U81V4=","To":"Jacopo Mondi <jacopo@jmondi.org>, libcamera-devel@lists.libcamera.org","References":"<20210430160026.190724-1-jacopo@jmondi.org>\n\t<20210430160026.190724-8-jacopo@jmondi.org>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Organization":"Ideas on Board","Message-ID":"<7d8a75ca-ca66-43e1-57e9-86fde85e927b@ideasonboard.com>","Date":"Fri, 30 Apr 2021 20:10:40 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.7.1","MIME-Version":"1.0","In-Reply-To":"<20210430160026.190724-8-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v4 07/16] 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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":16711,"web_url":"https://patchwork.libcamera.org/comment/16711/","msgid":"<YIz1be5fQpT1T0iz@oden.dyn.berto.se>","date":"2021-05-01T06:30:05","subject":"Re: [libcamera-devel] [PATCH v4 07/16] libcamera: rkisp1: Do not\n\tover-write metadata","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for fixing this long overdue todo :-)\n\nOn 2021-04-30 18:00:17 +0200, Jacopo Mondi wrote:\n> When a Request is completed upon receiving the IPA produced metadata,\n> the metadata associated with the Request are over-written, deleting\n> the information set at output buffer completion, such as the\n> SensorTimestamp.\n> \n> This commit applies to the RkISP1 pipeline handler the same change\n> applied to IPU3 in commit 13a7ed7b1f1f (\"libcamera: ipu3: Do not\n> over-write metadata\") but compared to that commit it uses the newly\n> introduced ControlList::merge() function.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 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> -- \n> 2.31.1\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 99382BDE6B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat,  1 May 2021 06:30:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 59A4660511;\n\tSat,  1 May 2021 08:30:08 +0200 (CEST)","from mail-lf1-x134.google.com (mail-lf1-x134.google.com\n\t[IPv6:2a00:1450:4864:20::134])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E660602BF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat,  1 May 2021 08:30:07 +0200 (CEST)","by mail-lf1-x134.google.com with SMTP id c11so381885lfi.9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 30 Apr 2021 23:30:07 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tu10sm487705lfq.243.2021.04.30.23.30.05\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 30 Apr 2021 23:30:06 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"RoU9tAqo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=MFDjjvcu57vOkuKC8xg3efsJzCR/xTsj3d2waEo/x5I=;\n\tb=RoU9tAqoZP9cHGulbPo1YVDLl49t7vE9NkNDdkUz5P/hKSGI/6CajFrVYaUJ5BEulg\n\tBKY0dUcFaq6bRjzT/odnm8e4/QohmeDirLIB/5jYw/RLa1HQoopSgJl+R8i6+COfQpTe\n\tJgW2LzZfoWbKSPbdIZM9kEojWgdJjvLe1t851txz+nvIdTve1uh+f8seqbKviNs9RZDE\n\tL2eejqDFVbXDiEjNazD85QaeRUTM4dnRmBGQM5rTE9psYFgFDWc5XXADPJlYA8dyTKsV\n\tLDXeNNLiGcD+ZoE2jszCnJHwOKYl3/weLvpCspIZrEKafZmbbixJBMgtIcjuu7p3cEj9\n\tBSlQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=MFDjjvcu57vOkuKC8xg3efsJzCR/xTsj3d2waEo/x5I=;\n\tb=uVLoPG74ue4UQUgmRbQmXVTdXej60NEIclPgho5tqIo3TXtTDe5fmemQRBVgj8p4ut\n\tlp3QsA/O7kE7krtqA9Aoc0jPRxGBa51vwyeu6zLUKm4U8s6iuwFbpcgRsNf8PaF7Ywww\n\tu/nF1YuA1vf33N43lFUjhSjogEi3OcvpXtN9Talx0gz9L4mdPEXVVhljsJTSeudtodDr\n\tWflNELd0r5UtSJdfLbfBIf9F/z3NkRw9V5T8rXp/MhhsJZ9mrKY2DbBo4d6wVdLikqKn\n\tQnWE+JKQ1uiTn964mq3cr+og01bKN7AEMaCBc2c9ISLFInLLOTzvJ5klB1BVHIHQCxT/\n\tHUzg==","X-Gm-Message-State":"AOAM5333hsK8tIQAREfiDevcR0YxtYrsF/3HfLtIGls/YAp4kBoTrPU9\n\ttRGd2iAZ89UZbb+QgWSji4hcLA==","X-Google-Smtp-Source":"ABdhPJzEW8HGwGFZUGhubj8RExuf9lKQTjy67Y+gOPxt3ssYmpjgOBrAKG7OTBAWYUYdI4s4wreqBw==","X-Received":"by 2002:a05:6512:36c3:: with SMTP id\n\te3mr5768798lfs.383.1619850606520; \n\tFri, 30 Apr 2021 23:30:06 -0700 (PDT)","Date":"Sat, 1 May 2021 08:30:05 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<YIz1be5fQpT1T0iz@oden.dyn.berto.se>","References":"<20210430160026.190724-1-jacopo@jmondi.org>\n\t<20210430160026.190724-8-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210430160026.190724-8-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v4 07/16] 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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":16719,"web_url":"https://patchwork.libcamera.org/comment/16719/","msgid":"<20210501075604.ax6qmlcz3qp2xbtw@uno.localdomain>","date":"2021-05-01T07:56:04","subject":"Re: [libcamera-devel] [PATCH v4 07/16] libcamera: rkisp1: Do not\n\tover-write metadata","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran,\n\nOn Fri, Apr 30, 2021 at 08:10:40PM +0100, Kieran Bingham wrote:\n> Hi Jacopo,\n>\n> On 30/04/2021 17:00, Jacopo Mondi wrote:\n> > When a Request is completed upon receiving the IPA produced metadata,\n> > the metadata associated with the Request are over-written, deleting\n> > the information set at output buffer completion, such as the\n> > SensorTimestamp.\n> >\n> > This commit applies to the RkISP1 pipeline handler the same change\n> > applied to IPU3 in commit 13a7ed7b1f1f (\"libcamera: ipu3: Do not\n> > over-write metadata\") but compared to that commit it uses the newly\n> > introduced ControlList::merge() function.\n>\n> It sounds like 13a7ed7b1f1f (\"libcamera: ipu3: Do not over-write\n> metadata\") has added a todo which was waiting for a .merge() to become\n> available to solve this in the same way.\n>\n> With this series adding the .merge() Can/Should we update the IPU3 in\n> the same way either as an extra patch on this series or make sure we do\n> it on top?\n\nAm I wrong or the IPA does not produce metadata at the moment ?\n\n>\n> --\n> Kieran\n>\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> >  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> >  1 file changed, 1 insertion(+), 1 deletion(-)\n> >\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index 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> >\n>\n> --\n> Regards\n> --\n> Kieran","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 F3977BDE6A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat,  1 May 2021 07:55:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6B17E688CA;\n\tSat,  1 May 2021 09:55:23 +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 148AE688AE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat,  1 May 2021 09:55:22 +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 68319FF803;\n\tSat,  1 May 2021 07:55:21 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","Date":"Sat, 1 May 2021 09:56:04 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<20210501075604.ax6qmlcz3qp2xbtw@uno.localdomain>","References":"<20210430160026.190724-1-jacopo@jmondi.org>\n\t<20210430160026.190724-8-jacopo@jmondi.org>\n\t<7d8a75ca-ca66-43e1-57e9-86fde85e927b@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<7d8a75ca-ca66-43e1-57e9-86fde85e927b@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v4 07/16] 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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":16729,"web_url":"https://patchwork.libcamera.org/comment/16729/","msgid":"<6c95dd2f-a502-cefb-cc6c-56b96a8fae6a@ideasonboard.com>","date":"2021-05-02T20:20:21","subject":"Re: [libcamera-devel] [PATCH v4 07/16] libcamera: rkisp1: Do not\n\tover-write metadata","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 01/05/2021 08:56, Jacopo Mondi wrote:\n> Hi Kieran,\n> \n> On Fri, Apr 30, 2021 at 08:10:40PM +0100, Kieran Bingham wrote:\n>> Hi Jacopo,\n>>\n>> On 30/04/2021 17:00, Jacopo Mondi wrote:\n>>> When a Request is completed upon receiving the IPA produced metadata,\n>>> the metadata associated with the Request are over-written, deleting\n>>> the information set at output buffer completion, such as the\n>>> SensorTimestamp.\n>>>\n>>> This commit applies to the RkISP1 pipeline handler the same change\n>>> applied to IPU3 in commit 13a7ed7b1f1f (\"libcamera: ipu3: Do not\n>>> over-write metadata\") but compared to that commit it uses the newly\n>>> introduced ControlList::merge() function.\n>>\n>> It sounds like 13a7ed7b1f1f (\"libcamera: ipu3: Do not over-write\n>> metadata\") has added a todo which was waiting for a .merge() to become\n>> available to solve this in the same way.\n>>\n>> With this series adding the .merge() Can/Should we update the IPU3 in\n>> the same way either as an extra patch on this series or make sure we do\n>> it on top?\n> \n> Am I wrong or the IPA does not produce metadata at the moment ?\n\n(I haven't even checked...) Is that relevant?\n\nIf or when it does - it will be affected in the same way as the other\nIPAs. Seems better to make things all consistent in the same way at the\nsame time - otherwise, when we add metadata - we'll hit the 'bug' and\nhave to re-investigate it...\n\n--\n\nKieran\n\n\n> \n>>\n>> --\n>> Kieran\n>>\n>>> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n>>> ---\n>>>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n>>>  1 file changed, 1 insertion(+), 1 deletion(-)\n>>>\n>>> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n>>> index 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>>>\n>>\n>> --\n>> Regards\n>> --\n>> Kieran","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 1D1DBBDE74\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun,  2 May 2021 20:20:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8D53768901;\n\tSun,  2 May 2021 22:20:25 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 577B3688AF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun,  2 May 2021 22:20:24 +0200 (CEST)","from [IPv6:2a02:c7f:18f1:100:b12f:c62f:79f3:7d84] (unknown\n\t[IPv6:2a02:c7f:18f1:100:b12f:c62f:79f3:7d84])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A86C5883;\n\tSun,  2 May 2021 22:20:23 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"QFdy0lIm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619986823;\n\tbh=4HGENKcBdiJQRreo+PEYr01JaZ0zDu1JEQ3138buU7Y=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=QFdy0lImGjpcFhaAVgN+M0V0T1z81CKZbosvx/URaNAbtlWviPjXVPTudI3iZnk53\n\tst33Dz9H/pk0qSE7DiDJJZS4Q1PGb8s7CWESwiiTOzTQqOyXUQdVtWd0f5TqGhpE9f\n\tqaJOQX/WcySz3IGwkckM4z8IPeoYrsRxkYNDsvDQ=","To":"Jacopo Mondi <jacopo@jmondi.org>","References":"<20210430160026.190724-1-jacopo@jmondi.org>\n\t<20210430160026.190724-8-jacopo@jmondi.org>\n\t<7d8a75ca-ca66-43e1-57e9-86fde85e927b@ideasonboard.com>\n\t<20210501075604.ax6qmlcz3qp2xbtw@uno.localdomain>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Organization":"Ideas on Board","Message-ID":"<6c95dd2f-a502-cefb-cc6c-56b96a8fae6a@ideasonboard.com>","Date":"Sun, 2 May 2021 21:20:21 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.7.1","MIME-Version":"1.0","In-Reply-To":"<20210501075604.ax6qmlcz3qp2xbtw@uno.localdomain>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v4 07/16] 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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]