[{"id":14674,"web_url":"https://patchwork.libcamera.org/comment/14674/","msgid":"","date":"2021-01-21T21:39:14","subject":"Re: [libcamera-devel] [PATCH 6/7] android: camera_device: Use\n\tCameraMetadata in processControls()","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 Thu, Jan 21, 2021 at 05:53:04PM +0100, Jacopo Mondi wrote:\n> Use the CameraMetadata API to retrieve the values of the request\n> associated settings in CameraDevice::processControls() function.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 15 ++++++---------\n> src/android/camera_device.h | 3 +--\n> 2 files changed, 7 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 9733c84612bd..d185fdf7fb2f 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1623,10 +1623,10 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer\n> \treturn new FrameBuffer(std::move(planes));\n> }\n> \n> -int CameraDevice::processControls(const camera3_capture_request_t *camera3Request,\n> -\t\t\t\t Camera3RequestDescriptor *descriptor)\n> +int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n> {\n> -\tif (!camera3Request->settings)\n> +\tconst CameraMetadata &settings = descriptor->settings_;\n> +\tif (!settings.isValid())\n> \t\treturn 0;\n> \n> \t/*\n> @@ -1635,12 +1635,9 @@ int CameraDevice::processControls(const camera3_capture_request_t *camera3Reques\n> \t * \\todo As soon as more controls are handled, this part should be\n> \t * broken out to a dedicated function.\n> \t */\n> -\tconst camera_metadata_t *camera3Settings = camera3Request->settings;\n> \tcamera_metadata_ro_entry_t entry;\n> -\tint ret = find_camera_metadata_ro_entry(camera3Settings,\n> -\t\t\t\t\t\tANDROID_SCALER_CROP_REGION,\n> -\t\t\t\t\t\t&entry);\n> -\tif (!ret) {\n> +\tbool found = settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry);\n> +\tif (found) {\n\nYou could write\n\n\tif (settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry)) {\n\nReviewed-by: Laurent Pinchart \n\n> \t\tconst int32_t *data = entry.data.i32;\n> \t\tRectangle cropRegion{ data[0], data[1],\n> \t\t\t\t static_cast(data[2]),\n> @@ -1752,7 +1749,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t * Translate controls from Android to libcamera and queue the request\n> \t * to the CameraWorker thread.\n> \t */\n> -\tint ret = processControls(camera3Request, descriptor);\n> +\tint ret = processControls(descriptor);\n> \tif (ret)\n> \t\treturn ret;\n> \n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index bad3be8e8066..597d11fcda2e 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -104,8 +104,7 @@ private:\n> \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n> \tCameraMetadata *requestTemplatePreview();\n> \tlibcamera::PixelFormat toPixelFormat(int format) const;\n> -\tint processControls(const camera3_capture_request_t *camera3Request,\n> -\t\t\t Camera3RequestDescriptor *descriptor);\n> +\tint processControls(Camera3RequestDescriptor *descriptor);\n> \tstd::unique_ptr getResultMetadata(\n> \t\tCamera3RequestDescriptor *descriptor, int64_t timestamp);\n>","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 1DF17C0F2A\n\tfor ;\n\tThu, 21 Jan 2021 21:39:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E251168229;\n\tThu, 21 Jan 2021 22:39:33 +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 0383868220\n\tfor ;\n\tThu, 21 Jan 2021 22:39:33 +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 8972450E;\n\tThu, 21 Jan 2021 22:39:32 +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=\"t9HkHIWt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611265172;\n\tbh=ARgCvyBtiva9zCRf/scz06O9N84UtErz8B2oPyzDZdo=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=t9HkHIWt8z2iZ4nMA69Il9SchdyAT6+oSPSbFuUb6rr2X4V3ezqv9iZy+ThxpyD8A\n\t1wjCZMMrWcXu0EK5W+cXCT10EX1ZIUzfUWBUrS0kGoQwhApBcJoS8dSLT4PL1+tHyh\n\t9jKVGM2xKYH7uyzj0HKjKDCdBYqdvPUt1SAQ2QcY=","Date":"Thu, 21 Jan 2021 23:39:14 +0200","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210121165305.367801-1-jacopo@jmondi.org>\n\t<20210121165305.367801-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210121165305.367801-7-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 6/7] android: camera_device: Use\n\tCameraMetadata in processControls()","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\" "}},{"id":14681,"web_url":"https://patchwork.libcamera.org/comment/14681/","msgid":"<20210122042535.GH1943@pyrite.rasen.tech>","date":"2021-01-22T04:25:35","subject":"Re: [libcamera-devel] [PATCH 6/7] android: camera_device: Use\n\tCameraMetadata in processControls()","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Thu, Jan 21, 2021 at 05:53:04PM +0100, Jacopo Mondi wrote:\n> Use the CameraMetadata API to retrieve the values of the request\n> associated settings in CameraDevice::processControls() function.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Paul Elder \n\n> ---\n> src/android/camera_device.cpp | 15 ++++++---------\n> src/android/camera_device.h | 3 +--\n> 2 files changed, 7 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 9733c84612bd..d185fdf7fb2f 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1623,10 +1623,10 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer\n> \treturn new FrameBuffer(std::move(planes));\n> }\n> \n> -int CameraDevice::processControls(const camera3_capture_request_t *camera3Request,\n> -\t\t\t\t Camera3RequestDescriptor *descriptor)\n> +int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n> {\n> -\tif (!camera3Request->settings)\n> +\tconst CameraMetadata &settings = descriptor->settings_;\n> +\tif (!settings.isValid())\n> \t\treturn 0;\n> \n> \t/*\n> @@ -1635,12 +1635,9 @@ int CameraDevice::processControls(const camera3_capture_request_t *camera3Reques\n> \t * \\todo As soon as more controls are handled, this part should be\n> \t * broken out to a dedicated function.\n> \t */\n> -\tconst camera_metadata_t *camera3Settings = camera3Request->settings;\n> \tcamera_metadata_ro_entry_t entry;\n> -\tint ret = find_camera_metadata_ro_entry(camera3Settings,\n> -\t\t\t\t\t\tANDROID_SCALER_CROP_REGION,\n> -\t\t\t\t\t\t&entry);\n> -\tif (!ret) {\n> +\tbool found = settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry);\n> +\tif (found) {\n> \t\tconst int32_t *data = entry.data.i32;\n> \t\tRectangle cropRegion{ data[0], data[1],\n> \t\t\t\t static_cast(data[2]),\n> @@ -1752,7 +1749,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t * Translate controls from Android to libcamera and queue the request\n> \t * to the CameraWorker thread.\n> \t */\n> -\tint ret = processControls(camera3Request, descriptor);\n> +\tint ret = processControls(descriptor);\n> \tif (ret)\n> \t\treturn ret;\n> \n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index bad3be8e8066..597d11fcda2e 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -104,8 +104,7 @@ private:\n> \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n> \tCameraMetadata *requestTemplatePreview();\n> \tlibcamera::PixelFormat toPixelFormat(int format) const;\n> -\tint processControls(const camera3_capture_request_t *camera3Request,\n> -\t\t\t Camera3RequestDescriptor *descriptor);\n> +\tint processControls(Camera3RequestDescriptor *descriptor);\n> \tstd::unique_ptr getResultMetadata(\n> \t\tCamera3RequestDescriptor *descriptor, int64_t timestamp);\n> \n> -- \n> 2.29.2\n>","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 2EBB7BD808\n\tfor ;\n\tFri, 22 Jan 2021 04:25:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A4D8668229;\n\tFri, 22 Jan 2021 05:25:43 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C015D68212\n\tfor ;\n\tFri, 22 Jan 2021 05:25:42 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1F0DD50E;\n\tFri, 22 Jan 2021 05:25:40 +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=\"FE7HQcL1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611289542;\n\tbh=ou+Rxi7nZ32/qdqRuTxb2Sc6GJauRe+XuiILYTJq0v4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=FE7HQcL19JXW3Ik6m3lrudeJimlCurh7Tnrut2zL1f8bwO2/cqbs/wd/eV0igb5eS\n\t/1HP5yCubsmDywcO/3SDx0rgWS+ZzqEQdGVYwAPs3slfvOp3ccgSlU/Dd2C3FI+GjO\n\tfrKP3t0xQYlWyqrypQU+gjuCn5f6ku4F7jWJw57A=","Date":"Fri, 22 Jan 2021 13:25:35 +0900","From":"paul.elder@ideasonboard.com","To":"Jacopo Mondi ","Message-ID":"<20210122042535.GH1943@pyrite.rasen.tech>","References":"<20210121165305.367801-1-jacopo@jmondi.org>\n\t<20210121165305.367801-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210121165305.367801-7-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 6/7] android: camera_device: Use\n\tCameraMetadata in processControls()","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\" "}},{"id":14686,"web_url":"https://patchwork.libcamera.org/comment/14686/","msgid":"<20210122092950.t6k27vgirj7ctasb@uno.localdomain>","date":"2021-01-22T09:29:50","subject":"Re: [libcamera-devel] [PATCH 6/7] android: camera_device: Use\n\tCameraMetadata in processControls()","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Paul, Laurent\n\nOn Fri, Jan 22, 2021 at 01:25:35PM +0900, paul.elder@ideasonboard.com wrote:\n> Hi Jacopo,\n>\n> On Thu, Jan 21, 2021 at 05:53:04PM +0100, Jacopo Mondi wrote:\n> > Use the CameraMetadata API to retrieve the values of the request\n> > associated settings in CameraDevice::processControls() function.\n> >\n> > Signed-off-by: Jacopo Mondi \n>\n> Reviewed-by: Paul Elder \n>\n\nThanks, this patch and the next one will probably be skept\nas they're based on my exposure+scaler series which is in review.\n\nI'll rather re-base those changes on top of this series.\n\nI'll push the reset of the series soon\n\nThanks\n j\n\n> > ---\n> > src/android/camera_device.cpp | 15 ++++++---------\n> > src/android/camera_device.h | 3 +--\n> > 2 files changed, 7 insertions(+), 11 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 9733c84612bd..d185fdf7fb2f 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -1623,10 +1623,10 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer\n> > \treturn new FrameBuffer(std::move(planes));\n> > }\n> >\n> > -int CameraDevice::processControls(const camera3_capture_request_t *camera3Request,\n> > -\t\t\t\t Camera3RequestDescriptor *descriptor)\n> > +int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n> > {\n> > -\tif (!camera3Request->settings)\n> > +\tconst CameraMetadata &settings = descriptor->settings_;\n> > +\tif (!settings.isValid())\n> > \t\treturn 0;\n> >\n> > \t/*\n> > @@ -1635,12 +1635,9 @@ int CameraDevice::processControls(const camera3_capture_request_t *camera3Reques\n> > \t * \\todo As soon as more controls are handled, this part should be\n> > \t * broken out to a dedicated function.\n> > \t */\n> > -\tconst camera_metadata_t *camera3Settings = camera3Request->settings;\n> > \tcamera_metadata_ro_entry_t entry;\n> > -\tint ret = find_camera_metadata_ro_entry(camera3Settings,\n> > -\t\t\t\t\t\tANDROID_SCALER_CROP_REGION,\n> > -\t\t\t\t\t\t&entry);\n> > -\tif (!ret) {\n> > +\tbool found = settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry);\n> > +\tif (found) {\n> > \t\tconst int32_t *data = entry.data.i32;\n> > \t\tRectangle cropRegion{ data[0], data[1],\n> > \t\t\t\t static_cast(data[2]),\n> > @@ -1752,7 +1749,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> > \t * Translate controls from Android to libcamera and queue the request\n> > \t * to the CameraWorker thread.\n> > \t */\n> > -\tint ret = processControls(camera3Request, descriptor);\n> > +\tint ret = processControls(descriptor);\n> > \tif (ret)\n> > \t\treturn ret;\n> >\n> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > index bad3be8e8066..597d11fcda2e 100644\n> > --- a/src/android/camera_device.h\n> > +++ b/src/android/camera_device.h\n> > @@ -104,8 +104,7 @@ private:\n> > \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n> > \tCameraMetadata *requestTemplatePreview();\n> > \tlibcamera::PixelFormat toPixelFormat(int format) const;\n> > -\tint processControls(const camera3_capture_request_t *camera3Request,\n> > -\t\t\t Camera3RequestDescriptor *descriptor);\n> > +\tint processControls(Camera3RequestDescriptor *descriptor);\n> > \tstd::unique_ptr getResultMetadata(\n> > \t\tCamera3RequestDescriptor *descriptor, int64_t timestamp);\n> >\n> > --\n> > 2.29.2\n> >","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 CAE02C0F2A\n\tfor ;\n\tFri, 22 Jan 2021 09:29:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6042768233;\n\tFri, 22 Jan 2021 10:29:33 +0100 (CET)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F36F66822F\n\tfor ;\n\tFri, 22 Jan 2021 10:29:31 +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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 5F7B9E0015;\n\tFri, 22 Jan 2021 09:29:31 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Fri, 22 Jan 2021 10:29:50 +0100","From":"Jacopo Mondi ","To":"paul.elder@ideasonboard.com","Message-ID":"<20210122092950.t6k27vgirj7ctasb@uno.localdomain>","References":"<20210121165305.367801-1-jacopo@jmondi.org>\n\t<20210121165305.367801-7-jacopo@jmondi.org>\n\t<20210122042535.GH1943@pyrite.rasen.tech>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210122042535.GH1943@pyrite.rasen.tech>","Subject":"Re: [libcamera-devel] [PATCH 6/7] android: camera_device: Use\n\tCameraMetadata in processControls()","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\" "}}]