[{"id":14004,"web_url":"https://patchwork.libcamera.org/comment/14004/","msgid":"<4670d736-da01-d8ea-c057-33c507fa58d0@ideasonboard.com>","date":"2020-12-01T16:03:17","subject":"Re: [libcamera-devel] [PATCH v2] android: camera_mode: Reserve\n\t'data' vectors","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/12/2020 15:59, Jacopo Mondi wrote:\n> The CameraDevice::getStaticMetadata() function populates the\n> entries for Android's static metadata by walking the ControlInfo\n> supported values reported by the libcamera pipeline.\n> \n> The number of entries to be passed to Android is computed using the\n> vector's size which is initialized at vector creation time to the\n> maximum number of available entries.\n> \n> In order to report the correct number of metadata do not create the\n> vector with the largest possible number of elements but only reserve\n> space for them using std::vector::reserve() which does not modify the\n> vector's size.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n> This patch fixes cros_camera_test:\n> Camera3DeviceTest/Camera3DeviceDefaultSettings.ConstructDefaultSettings/1\n> ---\n\nBe careful about removing the extra '---' when applying, but this looks\ngood now.\n\nI still wish we could automate the overall sizing of the metadata\ncomponents, but that's quite different to this patch (but it reminds me\nof it...)\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\n>  src/android/camera_device.cpp | 9 ++++++---\n>  1 file changed, 6 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 4690346e05cb..4eb05df0fdc2 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -596,7 +596,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \n>  \t/* Color correction static metadata. */\n>  \t{\n> -\t\tstd::vector<uint8_t> data(3);\n> +\t\tstd::vector<uint8_t> data;\n> +\t\tdata.reserve(3);\n>  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::ColorCorrectionAberrationMode);\n>  \t\tif (infoMap != controlsInfo.end()) {\n>  \t\t\tfor (const auto &value : infoMap->second.values())\n> @@ -782,7 +783,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\t\t\t  &maxFaceCount, 1);\n> \n>  \t{\n> -\t\tstd::vector<uint8_t> data(2);\n> +\t\tstd::vector<uint8_t> data;\n> +\t\tdata.reserve(2);\n>  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::LensShadingMapMode);\n>  \t\tif (infoMap != controlsInfo.end()) {\n>  \t\t\tfor (const auto &value : infoMap->second.values())\n> @@ -850,7 +852,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \n>  \t/* Noise reduction modes. */\n>  \t{\n> -\t\tstd::vector<uint8_t> data(5);\n> +\t\tstd::vector<uint8_t> data;\n> +\t\tdata.reserve(5);\n>  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::NoiseReductionMode);\n>  \t\tif (infoMap != controlsInfo.end()) {\n>  \t\t\tfor (const auto &value : infoMap->second.values())\n> --\n> 2.29.1\n> \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 1FFEDBE176\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  1 Dec 2020 16:03:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FE6163503;\n\tTue,  1 Dec 2020 17:03:22 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4988F63460\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  1 Dec 2020 17:03:21 +0100 (CET)","from [192.168.0.217]\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 AB126DBD;\n\tTue,  1 Dec 2020 17:03:20 +0100 (CET)"],"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=\"kTruqNzo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1606838600;\n\tbh=DSW6Veii/5Mon47nRgkfsKrzkIAYiodYvUt0CEzeDvo=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=kTruqNzopzZpTYX4QRjkXfw4TiK02J+zoYvqaRbEQ5AsyOHDE5NRg/nmYBkrVijgU\n\tMtPcdn51zgrCNKwjbCPtj4mZjqNzhN8j0DkAwJwEBYIFtRb8dCM9qKs+dmcEUQbwFo\n\t+dzMcvL4BmR6RASBff+vNcalDZTjt7ti6rKZ4Fwc=","To":"Jacopo Mondi <jacopo@jmondi.org>, hanlinchen@chromium.org,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201201155930.58584-1-jacopo@jmondi.org>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<4670d736-da01-d8ea-c057-33c507fa58d0@ideasonboard.com>","Date":"Tue, 1 Dec 2020 16:03:17 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201201155930.58584-1-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2] android: camera_mode: Reserve\n\t'data' vectors","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":14006,"web_url":"https://patchwork.libcamera.org/comment/14006/","msgid":"<20201201163825.6mstl7fjq5sh4j5h@uno.localdomain>","date":"2020-12-01T16:38:25","subject":"Re: [libcamera-devel] [PATCH v2] android: camera_mode: Reserve\n\t'data' vectors","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Jacopo,\n   where does \"camera_mode:\" in subject come from ? 0_0\n\nOn Tue, Dec 01, 2020 at 04:03:17PM +0000, Kieran Bingham wrote:\n> Hi Jacopo,\n>\n> On 01/12/2020 15:59, Jacopo Mondi wrote:\n> > The CameraDevice::getStaticMetadata() function populates the\n> > entries for Android's static metadata by walking the ControlInfo\n> > supported values reported by the libcamera pipeline.\n> >\n> > The number of entries to be passed to Android is computed using the\n> > vector's size which is initialized at vector creation time to the\n> > maximum number of available entries.\n> >\n> > In order to report the correct number of metadata do not create the\n> > vector with the largest possible number of elements but only reserve\n> > space for them using std::vector::reserve() which does not modify the\n> > vector's size.\n> >\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> > This patch fixes cros_camera_test:\n> > Camera3DeviceTest/Camera3DeviceDefaultSettings.ConstructDefaultSettings/1\n> > ---\n>\n> Be careful about removing the extra '---' when applying, but this looks\n> good now.\n>\n> I still wish we could automate the overall sizing of the metadata\n> components, but that's quite different to this patch (but it reminds me\n> of it...)\n>\n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>\n\nThanks Kieran\n\n>\n> >  src/android/camera_device.cpp | 9 ++++++---\n> >  1 file changed, 6 insertions(+), 3 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 4690346e05cb..4eb05df0fdc2 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -596,7 +596,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> >\n> >  \t/* Color correction static metadata. */\n> >  \t{\n> > -\t\tstd::vector<uint8_t> data(3);\n> > +\t\tstd::vector<uint8_t> data;\n> > +\t\tdata.reserve(3);\n> >  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::ColorCorrectionAberrationMode);\n> >  \t\tif (infoMap != controlsInfo.end()) {\n> >  \t\t\tfor (const auto &value : infoMap->second.values())\n> > @@ -782,7 +783,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> >  \t\t\t\t  &maxFaceCount, 1);\n> >\n> >  \t{\n> > -\t\tstd::vector<uint8_t> data(2);\n> > +\t\tstd::vector<uint8_t> data;\n> > +\t\tdata.reserve(2);\n> >  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::LensShadingMapMode);\n> >  \t\tif (infoMap != controlsInfo.end()) {\n> >  \t\t\tfor (const auto &value : infoMap->second.values())\n> > @@ -850,7 +852,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> >\n> >  \t/* Noise reduction modes. */\n> >  \t{\n> > -\t\tstd::vector<uint8_t> data(5);\n> > +\t\tstd::vector<uint8_t> data;\n> > +\t\tdata.reserve(5);\n> >  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::NoiseReductionMode);\n> >  \t\tif (infoMap != controlsInfo.end()) {\n> >  \t\t\tfor (const auto &value : infoMap->second.values())\n> > --\n> > 2.29.1\n> >\n> > _______________________________________________\n> > libcamera-devel mailing list\n> > libcamera-devel@lists.libcamera.org\n> > https://lists.libcamera.org/listinfo/libcamera-devel\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 B0B66BE177\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  1 Dec 2020 16:38:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4DA5563503;\n\tTue,  1 Dec 2020 17:38:20 +0100 (CET)","from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CA62063460\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  1 Dec 2020 17:38:19 +0100 (CET)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id EF1FA2000C;\n\tTue,  1 Dec 2020 16:38:18 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Tue, 1 Dec 2020 17:38:25 +0100","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<20201201163825.6mstl7fjq5sh4j5h@uno.localdomain>","References":"<20201201155930.58584-1-jacopo@jmondi.org>\n\t<4670d736-da01-d8ea-c057-33c507fa58d0@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<4670d736-da01-d8ea-c057-33c507fa58d0@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2] android: camera_mode: Reserve\n\t'data' vectors","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":"hanlinchen@chromium.org, 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":14011,"web_url":"https://patchwork.libcamera.org/comment/14011/","msgid":"<20201201170125.GM4569@pendragon.ideasonboard.com>","date":"2020-12-01T17:01:25","subject":"Re: [libcamera-devel] [PATCH v2] android: camera_mode: Reserve\n\t'data' vectors","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Tue, Dec 01, 2020 at 04:59:30PM +0100, Jacopo Mondi wrote:\n> The CameraDevice::getStaticMetadata() function populates the\n> entries for Android's static metadata by walking the ControlInfo\n> supported values reported by the libcamera pipeline.\n> \n> The number of entries to be passed to Android is computed using the\n> vector's size which is initialized at vector creation time to the\n> maximum number of available entries.\n> \n> In order to report the correct number of metadata do not create the\n> vector with the largest possible number of elements but only reserve\n> space for them using std::vector::reserve() which does not modify the\n> vector's size.\n\nIndeed, I had even missed that we were creating vectors with a few\ndefault-initiliazed entries, and added additional entries after that.\n\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> ---\n> This patch fixes cros_camera_test:\n> Camera3DeviceTest/Camera3DeviceDefaultSettings.ConstructDefaultSettings/1\n\nYou could include this in the commit message.\n\n> ---\n>  src/android/camera_device.cpp | 9 ++++++---\n>  1 file changed, 6 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 4690346e05cb..4eb05df0fdc2 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -596,7 +596,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \n>  \t/* Color correction static metadata. */\n>  \t{\n> -\t\tstd::vector<uint8_t> data(3);\n> +\t\tstd::vector<uint8_t> data;\n> +\t\tdata.reserve(3);\n>  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::ColorCorrectionAberrationMode);\n>  \t\tif (infoMap != controlsInfo.end()) {\n>  \t\t\tfor (const auto &value : infoMap->second.values())\n> @@ -782,7 +783,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \t\t\t\t  &maxFaceCount, 1);\n> \n>  \t{\n> -\t\tstd::vector<uint8_t> data(2);\n> +\t\tstd::vector<uint8_t> data;\n> +\t\tdata.reserve(2);\n>  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::LensShadingMapMode);\n>  \t\tif (infoMap != controlsInfo.end()) {\n>  \t\t\tfor (const auto &value : infoMap->second.values())\n> @@ -850,7 +852,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \n>  \t/* Noise reduction modes. */\n>  \t{\n> -\t\tstd::vector<uint8_t> data(5);\n> +\t\tstd::vector<uint8_t> data;\n> +\t\tdata.reserve(5);\n>  \t\tconst auto &infoMap = controlsInfo.find(&controls::draft::NoiseReductionMode);\n>  \t\tif (infoMap != controlsInfo.end()) {\n>  \t\t\tfor (const auto &value : infoMap->second.values())","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 DE64FBE177\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  1 Dec 2020 17:01:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7989C63505;\n\tTue,  1 Dec 2020 18:01:36 +0100 (CET)","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 993EE63460\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  1 Dec 2020 18:01:34 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0AAD2DBD;\n\tTue,  1 Dec 2020 18:01:33 +0100 (CET)"],"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=\"QM6hiZGi\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1606842094;\n\tbh=PQfFIYvJdnN3lbD4pOHvoJq1uFyFqEVrLgJoLhCHlaA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=QM6hiZGi9ZTOgCtfGrhy9eev/jqnUpt9HxZ8oLvHnqgMSaWuu8bmswMR3Fshb5Lab\n\tonT6+dLcXjvf2HKPvbqHbtJkNsZnHs531Tx/jwJt3isbPnCQpdnDdHfsALhXWvbFAA\n\t6n/AmfXBsDq5E50uuXppd5/Ice9Po0M0bhFCTt28=","Date":"Tue, 1 Dec 2020 19:01:25 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<20201201170125.GM4569@pendragon.ideasonboard.com>","References":"<20201201155930.58584-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201201155930.58584-1-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2] android: camera_mode: Reserve\n\t'data' vectors","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":"hanlinchen@chromium.org, 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>"}}]