[{"id":14951,"web_url":"https://patchwork.libcamera.org/comment/14951/","msgid":"","date":"2021-02-04T09:21:53","subject":"Re: [libcamera-devel] [PATCH 1/7] android: camera_device: Report\n\tCOLOR_CORRECTION_ABERRATION_MODE","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 your work.\n\nOn 2021-02-03 17:25:54 +0100, Jacopo Mondi wrote:\n> The CaptureResultTest#testCameraCaptureResultAllKeys enforces the\n> presence of the ANDROID_COLOR_CORRECTION_ABERRATION_MODE result\n> metadata.\n> \n> Report the only supported value of\n> ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF.\n> \n> Signed-off-by: Jacopo Mondi \n\nAs with this and the following patches I trust your calculations when \nupdating the number and size of the added keys.\n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_device.cpp | 11 ++++++++---\n> 1 file changed, 8 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index a50b0ebfe60e..02908beb867e 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -708,7 +708,7 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n> \t * Currently: 53 entries, 846 bytes of static metadata\n> \t */\n> \tuint32_t numEntries = 53;\n> -\tuint32_t byteSize = 846;\n> +\tuint32_t byteSize = 850;\n> \n> \t/*\n> \t * Calculate space occupation in bytes for dynamically built metadata\n> @@ -1243,6 +1243,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\t\t availableRequestKeys.size());\n> \n> \tstd::vector availableResultKeys = {\n> +\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> \t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n> \t\tANDROID_CONTROL_AE_LOCK,\n> \t\tANDROID_CONTROL_AE_MODE,\n> @@ -1960,7 +1961,7 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n> \t * Total bytes for JPEG metadata: 82\n> \t */\n> \tstd::unique_ptr resultMetadata =\n> -\t\tstd::make_unique(40, 156);\n> +\t\tstd::make_unique(41, 157);\n> \tif (!resultMetadata->isValid()) {\n> \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n> \t\treturn nullptr;\n> @@ -1972,7 +1973,11 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n> \t * from libcamera::Request::metadata.\n> \t */\n> \n> -\tuint8_t value = ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF;\n> +\tuint8_t value = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n> +\tresultMetadata->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> +\t\t\t\t &value, 1);\n> +\n> +\tvalue = ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF;\n> \tresultMetadata->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE, &value, 1);\n> \n> \tvalue = ANDROID_CONTROL_AE_LOCK_OFF;\n> -- \n> 2.30.0\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 20CE2BD162\n\tfor ;\n\tThu, 4 Feb 2021 09:21:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A68A6613FB;\n\tThu, 4 Feb 2021 10:21:56 +0100 (CET)","from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com\n\t[IPv6:2a00:1450:4864:20::52f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0B26760107\n\tfor ;\n\tThu, 4 Feb 2021 10:21:55 +0100 (CET)","by mail-ed1-x52f.google.com with SMTP id s5so3228458edw.8\n\tfor ;\n\tThu, 04 Feb 2021 01:21:55 -0800 (PST)","from localhost (p4fca2458.dip0.t-ipconnect.de. [79.202.36.88])\n\tby smtp.gmail.com with ESMTPSA id\n\th25sm2181130ejy.7.2021.02.04.01.21.53\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 04 Feb 2021 01:21:54 -0800 (PST)"],"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=\"eZOlHSLf\"; 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=9qHQKVDmRZEvVheZdJXQfqwQlKuvil/mz9o+MZ5TEoM=;\n\tb=eZOlHSLfhtyfC4w1JhaC2V9kbxd/BGKVFprv6LgSOw9Z7Qm0T2lLRfT6xPwAgFQQ03\n\tW/knSTooiTItn+a/avqESh7oXFlEkrFh1NsV1oDYa+gHI0zc6r3i00RW3Wan79aRfIYd\n\tcYNq0Pw0rPrFhBih/8rDlZgw4kZZdwaruYt8g6MUyREdbCJlR7cqTldNPDO6rzQHbFkF\n\txMQXbSGffPy/HGHITUuuf8fxxI1Y5ZFotDr9pf/czj83iF3fGKLA5WSbTG9ohgbaX+9O\n\tInwKwZ5P/zjm0LgcOE/DWYMy0ocnq3L35QPAH6sTpQgR6DEgpwjujFPgQeKg1GksB7YW\n\tS7Qg==","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=9qHQKVDmRZEvVheZdJXQfqwQlKuvil/mz9o+MZ5TEoM=;\n\tb=S1sUwv7+m+x+vmfpz+cG+aaTqZfy8nHaxTSTOUZNqMnAW2IoHh/RruwtxElAtF76hF\n\tDvONAVSEl627kmkmlEg6MPESRCfBcU7p+p+O4Q+KKcVtDUE2QmYdpwpqlJkIDT4WisJJ\n\tkFaRSdm8AKcypce0nqiKPrsxjL4theMEcAt3JXzkfbo6mzcLmiQwRowUMcleBKKGgosY\n\t83WfLFvrBZh2XwFcFHHsoJL9mICch3S3L3Zn3y5Wj3Zqxa4402FUGwxKN7b3faQXJP3b\n\tAK7TrRjV7fucZekhNU46SX3vS3chbUULGY/eAX52FyLSNShDOhWGLTwjAw16XQrk3LMS\n\t7sKA==","X-Gm-Message-State":"AOAM532ZYKq9eO6Fw/tYFdPcgDHWlMuocJkqt+SI/DtxfF6eaTlbOwR9\n\t+b5mWEMjKge68uYsTmAcwulJTFYBzi7Vkkwk","X-Google-Smtp-Source":"ABdhPJzWQV6Cm24vgoV/2TBzfYbX1xMSjTi2iBFXEaWK+QSFuExAMHr1IOy6A8/wuaE3TzGsMbZeyA==","X-Received":"by 2002:a05:6402:11c7:: with SMTP id\n\tj7mr6999514edw.290.1612430514689; \n\tThu, 04 Feb 2021 01:21:54 -0800 (PST)","Date":"Thu, 4 Feb 2021 10:21:53 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210203162600.206297-1-jacopo@jmondi.org>\n\t<20210203162600.206297-2-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210203162600.206297-2-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 1/7] android: camera_device: Report\n\tCOLOR_CORRECTION_ABERRATION_MODE","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","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\" "}},{"id":15001,"web_url":"https://patchwork.libcamera.org/comment/15001/","msgid":"","date":"2021-02-04T22:09:38","subject":"Re: [libcamera-devel] [PATCH 1/7] android: camera_device: Report\n\tCOLOR_CORRECTION_ABERRATION_MODE","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 Wed, Feb 03, 2021 at 05:25:54PM +0100, Jacopo Mondi wrote:\n> The CaptureResultTest#testCameraCaptureResultAllKeys enforces the\n> presence of the ANDROID_COLOR_CORRECTION_ABERRATION_MODE result\n> metadata.\n> \n> Report the only supported value of\n> ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/android/camera_device.cpp | 11 ++++++++---\n> 1 file changed, 8 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index a50b0ebfe60e..02908beb867e 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -708,7 +708,7 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n> \t * Currently: 53 entries, 846 bytes of static metadata\n> \t */\n> \tuint32_t numEntries = 53;\n> -\tuint32_t byteSize = 846;\n> +\tuint32_t byteSize = 850;\n> \n> \t/*\n> \t * Calculate space occupation in bytes for dynamically built metadata\n> @@ -1243,6 +1243,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\t\t availableRequestKeys.size());\n> \n> \tstd::vector availableResultKeys = {\n> +\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> \t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n> \t\tANDROID_CONTROL_AE_LOCK,\n> \t\tANDROID_CONTROL_AE_MODE,\n> @@ -1960,7 +1961,7 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n> \t * Total bytes for JPEG metadata: 82\n> \t */\n> \tstd::unique_ptr resultMetadata =\n> -\t\tstd::make_unique(40, 156);\n> +\t\tstd::make_unique(41, 157);\n> \tif (!resultMetadata->isValid()) {\n> \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n> \t\treturn nullptr;\n> @@ -1972,7 +1973,11 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n> \t * from libcamera::Request::metadata.\n> \t */\n> \n> -\tuint8_t value = ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF;\n> +\tuint8_t value = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n> +\tresultMetadata->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> +\t\t\t\t &value, 1);\n> +\n> +\tvalue = ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF;\n> \tresultMetadata->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE, &value, 1);\n> \n> \tvalue = ANDROID_CONTROL_AE_LOCK_OFF;","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 D6747BD162\n\tfor ;\n\tThu, 4 Feb 2021 22:10:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6AFB76147F;\n\tThu, 4 Feb 2021 23:10:03 +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 C11DC61430\n\tfor ;\n\tThu, 4 Feb 2021 23:10:01 +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 3489445D;\n\tThu, 4 Feb 2021 23:10:01 +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=\"MuDptW0C\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1612476601;\n\tbh=qvncAY7ik6413f7J6+Q57mM+4YPrCN/ikqVrS0ycNj4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=MuDptW0Cdh/1v24fbdFxgMtQ6Ujpn3kLeiLZ2tsur7+dmFKULaNtALA/Y3UhsG0bK\n\t7Ugepya9BBbpfNfdDGKCFrYZx0Mjc5/pGzMMOUbMmc06g6TIkxKoOGLQfj4kmeC6Lx\n\tqlDuygNEItRhnyhpC1wlmvs23CBGqN/oo8lugQzs=","Date":"Fri, 5 Feb 2021 00:09:38 +0200","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210203162600.206297-1-jacopo@jmondi.org>\n\t<20210203162600.206297-2-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210203162600.206297-2-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 1/7] android: camera_device: Report\n\tCOLOR_CORRECTION_ABERRATION_MODE","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","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\" "}}]