[{"id":16751,"web_url":"https://patchwork.libcamera.org/comment/16751/","msgid":"<d655b498-2a52-51af-cde6-1dbe8e94e73c@ideasonboard.com>","date":"2021-05-04T08:12:34","subject":"Re: [libcamera-devel] [PATCH v5 08/17] 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":"On 03/05/2021 11:41, 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 2ee3dd57e2fc (\"libcamera: ipu3: Merge IPA\n> metadata controls\").\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\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>","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 1F25EBDE79\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  4 May 2021 08:12:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D09F56890C;\n\tTue,  4 May 2021 10:12:40 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 00DB56890C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  4 May 2021 10:12:39 +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 9ADED580;\n\tTue,  4 May 2021 10:12:38 +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=\"XzqMudGB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1620115958;\n\tbh=MOSy32seQbF9DigHRKxrVVUHSMdGHqc0utHHcl03ogQ=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=XzqMudGB3VJO8b5iy6G7DvJX0giMFaxUeAIQH93D3c92bB1WrufhIKKEg3E5A3/19\n\tLfMUs83K9Cavw7t/y60O1I13pW0wfBBQFC2XDCc2PWu0hBmk1dXT6kQixc2zjEhZd2\n\tJM1BritBoaXu17tOWDPjvCXOyyg8uhyHZbhbZoE4=","To":"Jacopo Mondi <jacopo@jmondi.org>, libcamera-devel@lists.libcamera.org","References":"<20210503104152.34048-1-jacopo@jmondi.org>\n\t<20210503104152.34048-9-jacopo@jmondi.org>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Organization":"Ideas on Board","Message-ID":"<d655b498-2a52-51af-cde6-1dbe8e94e73c@ideasonboard.com>","Date":"Tue, 4 May 2021 09:12:34 +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":"<20210503104152.34048-9-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [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":"<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":16782,"web_url":"https://patchwork.libcamera.org/comment/16782/","msgid":"<CAO5uPHOSuiH+U0vZNjdpgFUmRphTmufm+RdMATutTiWiR6wKEw@mail.gmail.com>","date":"2021-05-06T05:03:57","subject":"Re: [libcamera-devel] [PATCH v5 08/17] libcamera: rkisp1: Do not\n\tover-write metadata","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Jacopo, thank you for the patch.\n\nOn Tue, May 4, 2021 at 5:12 PM Kieran Bingham <\nkieran.bingham@ideasonboard.com> wrote:\n\n> On 03/05/2021 11:41, 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 2ee3dd57e2fc (\"libcamera: ipu3: Merge IPA\n> > metadata controls\").\n> >\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n>\n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>\n>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\n\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\n> 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\n> frame, const ControlList &meta\n> >       if (!info)\n> >               return;\n> >\n> > -     info->request->metadata() = metadata;\n> > +     info->request->metadata().merge(metadata);\n> >       info->metadataProcessed = true;\n> >\n> >       pipe->tryCompleteRequest(info->request);\n> >\n>\n> --\n> Regards\n> --\n> Kieran\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel\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 BCD8EBDE79\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  6 May 2021 05:04:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7A02D68911;\n\tThu,  6 May 2021 07:04:09 +0200 (CEST)","from mail-ed1-x530.google.com (mail-ed1-x530.google.com\n\t[IPv6:2a00:1450:4864:20::530])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E24F2688E5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  6 May 2021 07:04:07 +0200 (CEST)","by mail-ed1-x530.google.com with SMTP id d14so4610102edc.12\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 05 May 2021 22:04:07 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"V19eNtTn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=IL7YrfRLI8S9LzLdQxrh4s2yUGvsotB6fVlMs6AV/0g=;\n\tb=V19eNtTnyiWgW5irIgg5PQNlL/rjyawwahQObs1eEhrQrRH46COc4eWOu+X0sbnFbB\n\t+oNnBds6UjbQ5hVt4MN6kApad+8GDVtnfF5N+zpqHAKaQs3IoiLQivqG3hT6b07KT/PB\n\tDoLyHx87146G7nmdM9Mpu6mPbUcn+rXSRsz3A=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=IL7YrfRLI8S9LzLdQxrh4s2yUGvsotB6fVlMs6AV/0g=;\n\tb=hV2KlPLRAewrxKxuiUm56ht3IiTR0pfcZyxjn8+eBWUvMr5bDjAHN3ZVl4d94jzqd9\n\tNkK8ybPXEySM+4VHIM2xN1CACM5XqryY2HQ2NtleQiuKwhjfPxobccyTBGF3Je6iF/yE\n\tsoWes36FrK2fY4UzcTRGhka+U7QCweuE2hkYt45dO7YZ5hfUtDGukEB5Q0PSBpPxlPGf\n\tq9Gwq4Gerh7Yh/I8ei8s2MOFEWAqedAa7LQK+X8Vj4mrMDF1HotCKiFDgl2dOy/r/RNl\n\tswXHgupFSiRt3ilnpkrvEqdSoDvkQUiiVyPQVo0/Q8288VmBDtnRah2MJX8EO0TrCC6k\n\taBmw==","X-Gm-Message-State":"AOAM533xYAzMRgTNgJ5LsQVSJlqqe/EQdUbn2JcqHRIHk5Y99a9F4Uv3\n\tw6qdNUyAdgJYyLcSSFYXrherIauPsVhv3xT7XUmJsA==","X-Google-Smtp-Source":"ABdhPJxlpoqQbBit8IPsKwzfEBbp/QSzyR6JmVaivahFWiB8ZDc9gKhNi1iMnPAd60CsHf+rXmfZob+WOeAclHJxpl4=","X-Received":"by 2002:a50:8e44:: with SMTP id 4mr2880612edx.244.1620277447654; \n\tWed, 05 May 2021 22:04:07 -0700 (PDT)","MIME-Version":"1.0","References":"<20210503104152.34048-1-jacopo@jmondi.org>\n\t<20210503104152.34048-9-jacopo@jmondi.org>\n\t<d655b498-2a52-51af-cde6-1dbe8e94e73c@ideasonboard.com>","In-Reply-To":"<d655b498-2a52-51af-cde6-1dbe8e94e73c@ideasonboard.com>","From":"Hirokazu Honda <hiroh@chromium.org>","Date":"Thu, 6 May 2021 14:03:57 +0900","Message-ID":"<CAO5uPHOSuiH+U0vZNjdpgFUmRphTmufm+RdMATutTiWiR6wKEw@mail.gmail.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Subject":"Re: [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":"<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 <libcamera-devel@lists.libcamera.org>","Content-Type":"multipart/mixed;\n\tboundary=\"===============5171638554165774798==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]