[{"id":11564,"web_url":"https://patchwork.libcamera.org/comment/11564/","msgid":"<8bc43d53-028e-52da-fb1f-abb89f0f46a7@ideasonboard.com>","date":"2020-07-24T15:49:25","subject":"Re: [libcamera-devel] [PATCH 5/6] android: camera_device: Create\n\trequest templates per use-case","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 24/07/2020 15:21, Jacopo Mondi wrote:\n> Currently the request template returned from\n> CameraDevice::constructDefaultRequestSettings() is the same for all\n> the supported template types.\n> \n> To prepare to adjust the template depending on the use case, break out\n> the template generation to dedicated function.\n> \n> As we currently support the PREVIEW use case only, make all the other\n> template types use the captureTemplatePreview() function and just update\n> the capture intent property. This requires a nasty const-cast on the\n> generated template pack which will be removed once the functions will be\n> properly populated.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  src/android/camera_device.cpp | 146 +++++++++++++++++++++++++---------\n>  src/android/camera_device.h   |   7 ++\n>  2 files changed, 114 insertions(+), 39 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 48f8090a93db..b8cb118a960e 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -821,51 +821,15 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \treturn staticMetadata_->get();\n>  }\n>  \n> -/*\n> - * Produce a metadata pack to be used as template for a capture request.\n> - */\n> -const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> +const CameraMetadata *CameraDevice::captureTemplatePreview()\n>  {\n> -\tauto it = requestTemplates_.find(type);\n> -\tif (it != requestTemplates_.end())\n> -\t\treturn it->second->get();\n> -\n> -\t/* Use the capture intent matching the requested template type. */\n> -\tuint8_t captureIntent;\n> -\tswitch (type) {\n> -\tcase CAMERA3_TEMPLATE_PREVIEW:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_STILL_CAPTURE:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_MANUAL:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n> -\t\tbreak;\n> -\tdefault:\n> -\t\tLOG(HAL, Error) << \"Invalid template request type: \" << type;\n> -\t\treturn nullptr;\n> -\t}\n> -\n>  \t/*\n>  \t * \\todo Keep this in sync with the actual number of entries.\n>  \t * Currently: 12 entries, 15 bytes\n>  \t */\n>  \tCameraMetadata *requestTemplate = new CameraMetadata(15, 20);\n> -\tif (!requestTemplate->isValid()) {\n> -\t\tLOG(HAL, Error) << \"Failed to allocate template metadata\";\n> -\t\tdelete requestTemplate;\n> +\tif (!requestTemplate->isValid())\n>  \t\treturn nullptr;\n> -\t}\n\nAre you calling new() there without delete()ing it on failure?\n\n\n\n>  \tuint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;\n>  \trequestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,\n> @@ -911,10 +875,114 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n>  \trequestTemplate->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n>  \t\t\t\t  &aberrationMode, 1);\n>  \n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n>  \trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n>  \t\t\t\t  &captureIntent, 1);\n>  \n> -\tif (!requestTemplate->isValid()) {\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateStillCapture()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateVideoRecord()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateVideoSnapshot()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateZSL()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateManual()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +/*\n> + * Produce a metadata pack to be used as template for a capture request.\n> + */\n> +const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> +{\n> +\tauto it = requestTemplates_.find(type);\n> +\tif (it != requestTemplates_.end())\n> +\t\treturn it->second->get();\n> +\n> +\t/* Use the capture intent matching the requested template type. */\n> +\tconst CameraMetadata *requestTemplate;\n> +\tswitch (type) {\n> +\tcase CAMERA3_TEMPLATE_PREVIEW:\n> +\t\trequestTemplate = captureTemplatePreview();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_STILL_CAPTURE:\n> +\t\trequestTemplate = captureTemplateStillCapture();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> +\t\trequestTemplate = captureTemplateVideoRecord();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:\n> +\t\trequestTemplate = captureTemplateVideoSnapshot();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n> +\t\trequestTemplate = captureTemplateZSL();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_MANUAL:\n> +\t\trequestTemplate = captureTemplateManual();\n> +\t\tbreak;\n> +\tdefault:\n> +\t\tLOG(HAL, Error) << \"Invalid template request type: \" << type;\n> +\t\treturn nullptr;\n> +\t}\n> +\n> +\tif (!requestTemplate || !requestTemplate->isValid()) {\n>  \t\tLOG(HAL, Error) << \"Failed to construct request template\";\n>  \t\tdelete requestTemplate;\n>  \t\treturn nullptr;\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index af1b58ab6b4e..7bf68e23f7fe 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -87,6 +87,13 @@ private:\n>  \tstd::unique_ptr<CameraMetadata> getResultMetadata(int frame_number,\n>  \t\t\t\t\t\t\t  int64_t timestamp);\n>  \n> +\tconst CameraMetadata *captureTemplatePreview();\n> +\tconst CameraMetadata *captureTemplateStillCapture();\n> +\tconst CameraMetadata *captureTemplateVideoRecord();\n> +\tconst CameraMetadata *captureTemplateVideoSnapshot();\n> +\tconst CameraMetadata *captureTemplateZSL();\n> +\tconst CameraMetadata *captureTemplateManual();\n> +\n>  \tunsigned int id_;\n>  \tcamera3_device_t camera3Device_;\n>  \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 225ADBD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 24 Jul 2020 15:49:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DFEF961218;\n\tFri, 24 Jul 2020 17:49:29 +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 1116A605B2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Jul 2020 17:49:28 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 99EEB538;\n\tFri, 24 Jul 2020 17:49:27 +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=\"ejPs9xKQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1595605767;\n\tbh=5zwJBP8NERaleNlvqu+UV11oT1GIEm15m2nspQu2YzU=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=ejPs9xKQuwWJhQs/ySBqefTo/ICat7efNJ+FnrPdxWoh4o8vA+JtLwI5Zakxe+uyW\n\tJ7TT4n4d7AV4sjzZZhIIlMkb9WeqY3L5d/La8GdLp6XSVYDv6dq9MqX4+wOFzGdWS0\n\t5KZl/OSVqyKZl9vKfOIVIWt7ba6vF+BIM8ufBzbM=","To":"Jacopo Mondi <jacopo@jmondi.org>, libcamera-devel@lists.libcamera.org","References":"<20200724142120.95538-1-jacopo@jmondi.org>\n\t<20200724142120.95538-6-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":"<8bc43d53-028e-52da-fb1f-abb89f0f46a7@ideasonboard.com>","Date":"Fri, 24 Jul 2020 16:49:25 +0100","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":"<20200724142120.95538-6-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 5/6] android: camera_device: Create\n\trequest templates per use-case","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":11568,"web_url":"https://patchwork.libcamera.org/comment/11568/","msgid":"<20200724160045.GI5921@pendragon.ideasonboard.com>","date":"2020-07-24T16:00:45","subject":"Re: [libcamera-devel] [PATCH 5/6] android: camera_device: Create\n\trequest templates per use-case","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 Fri, Jul 24, 2020 at 04:21:19PM +0200, Jacopo Mondi wrote:\n> Currently the request template returned from\n> CameraDevice::constructDefaultRequestSettings() is the same for all\n> the supported template types.\n> \n> To prepare to adjust the template depending on the use case, break out\n> the template generation to dedicated function.\n\ns/dedicated/a dedicated/\n\n> \n> As we currently support the PREVIEW use case only, make all the other\n> template types use the captureTemplatePreview() function and just update\n> the capture intent property. This requires a nasty const-cast on the\n> generated template pack which will be removed once the functions will be\n> properly populated.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  src/android/camera_device.cpp | 146 +++++++++++++++++++++++++---------\n>  src/android/camera_device.h   |   7 ++\n>  2 files changed, 114 insertions(+), 39 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 48f8090a93db..b8cb118a960e 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -821,51 +821,15 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>  \treturn staticMetadata_->get();\n>  }\n>  \n> -/*\n> - * Produce a metadata pack to be used as template for a capture request.\n> - */\n> -const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> +const CameraMetadata *CameraDevice::captureTemplatePreview()\n>  {\n> -\tauto it = requestTemplates_.find(type);\n> -\tif (it != requestTemplates_.end())\n> -\t\treturn it->second->get();\n> -\n> -\t/* Use the capture intent matching the requested template type. */\n> -\tuint8_t captureIntent;\n> -\tswitch (type) {\n> -\tcase CAMERA3_TEMPLATE_PREVIEW:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_STILL_CAPTURE:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG;\n> -\t\tbreak;\n> -\tcase CAMERA3_TEMPLATE_MANUAL:\n> -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n> -\t\tbreak;\n> -\tdefault:\n> -\t\tLOG(HAL, Error) << \"Invalid template request type: \" << type;\n> -\t\treturn nullptr;\n> -\t}\n> -\n>  \t/*\n>  \t * \\todo Keep this in sync with the actual number of entries.\n>  \t * Currently: 12 entries, 15 bytes\n>  \t */\n>  \tCameraMetadata *requestTemplate = new CameraMetadata(15, 20);\n> -\tif (!requestTemplate->isValid()) {\n> -\t\tLOG(HAL, Error) << \"Failed to allocate template metadata\";\n> -\t\tdelete requestTemplate;\n> +\tif (!requestTemplate->isValid())\n>  \t\treturn nullptr;\n> -\t}\n>  \n>  \tuint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;\n>  \trequestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,\n> @@ -911,10 +875,114 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n>  \trequestTemplate->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n>  \t\t\t\t  &aberrationMode, 1);\n>  \n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n>  \trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n>  \t\t\t\t  &captureIntent, 1);\n>  \n> -\tif (!requestTemplate->isValid()) {\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateStillCapture()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n\nYou'll leak requestTemplate here if it's not valid. You could just\nreturn requestTemplate instead.\n\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n\nYou could avoid the const_cast by making these functions return a\nnon-const pointer, and setting ANDROID_CONTROL_CAPTURE_INTENT in\nCameraDevice::constructDefaultRequestSettings(). This function would\nthen just become\n\n\treturn captureTemplatePreview();\n\nand will be filled later.\n\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateVideoRecord()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateVideoSnapshot()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateZSL()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +const CameraMetadata *CameraDevice::captureTemplateManual()\n> +{\n> +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> +\tif (!requestTemplate || !requestTemplate->isValid())\n> +\t\treturn nullptr;\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n> +\tconst_cast<CameraMetadata *>(requestTemplate)\n> +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> +/*\n> + * Produce a metadata pack to be used as template for a capture request.\n> + */\n> +const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> +{\n> +\tauto it = requestTemplates_.find(type);\n> +\tif (it != requestTemplates_.end())\n> +\t\treturn it->second->get();\n> +\n> +\t/* Use the capture intent matching the requested template type. */\n> +\tconst CameraMetadata *requestTemplate;\n> +\tswitch (type) {\n> +\tcase CAMERA3_TEMPLATE_PREVIEW:\n> +\t\trequestTemplate = captureTemplatePreview();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_STILL_CAPTURE:\n> +\t\trequestTemplate = captureTemplateStillCapture();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> +\t\trequestTemplate = captureTemplateVideoRecord();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:\n> +\t\trequestTemplate = captureTemplateVideoSnapshot();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n> +\t\trequestTemplate = captureTemplateZSL();\n> +\t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_MANUAL:\n> +\t\trequestTemplate = captureTemplateManual();\n> +\t\tbreak;\n> +\tdefault:\n> +\t\tLOG(HAL, Error) << \"Invalid template request type: \" << type;\n> +\t\treturn nullptr;\n> +\t}\n> +\n> +\tif (!requestTemplate || !requestTemplate->isValid()) {\n>  \t\tLOG(HAL, Error) << \"Failed to construct request template\";\n>  \t\tdelete requestTemplate;\n>  \t\treturn nullptr;\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index af1b58ab6b4e..7bf68e23f7fe 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -87,6 +87,13 @@ private:\n>  \tstd::unique_ptr<CameraMetadata> getResultMetadata(int frame_number,\n>  \t\t\t\t\t\t\t  int64_t timestamp);\n>  \n> +\tconst CameraMetadata *captureTemplatePreview();\n> +\tconst CameraMetadata *captureTemplateStillCapture();\n> +\tconst CameraMetadata *captureTemplateVideoRecord();\n> +\tconst CameraMetadata *captureTemplateVideoSnapshot();\n> +\tconst CameraMetadata *captureTemplateZSL();\n> +\tconst CameraMetadata *captureTemplateManual();\n> +\n>  \tunsigned int id_;\n>  \tcamera3_device_t camera3Device_;\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 29B99BD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 24 Jul 2020 16:00:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 831D861218;\n\tFri, 24 Jul 2020 18:00:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EB528605B2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Jul 2020 18:00:52 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 54ECE538;\n\tFri, 24 Jul 2020 18:00:52 +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=\"retMQ7c2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1595606452;\n\tbh=p6UFigxs/DO2noY6cwQ9hnTUl5yTdoNPlfZ9J1dwhI4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=retMQ7c2OjodJmqHdEa+ugxi22xhMoWInOOdvmeaTATAwf1NP0SMrelzCekeeULh9\n\tFSAnMkitRpi8LZ9wdXNeedJQQKIcDly5MrYlYLee69WhuUf8iRsLpSmbPdwKyI9MuT\n\t1e1oDuk5btv9hjSqrtrwaLSz41kKpgTWenGREkqc=","Date":"Fri, 24 Jul 2020 19:00:45 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<20200724160045.GI5921@pendragon.ideasonboard.com>","References":"<20200724142120.95538-1-jacopo@jmondi.org>\n\t<20200724142120.95538-6-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200724142120.95538-6-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 5/6] android: camera_device: Create\n\trequest templates per use-case","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":11599,"web_url":"https://patchwork.libcamera.org/comment/11599/","msgid":"<20200725123431.qshg6yio44iqq2zb@uno.localdomain>","date":"2020-07-25T12:34:31","subject":"Re: [libcamera-devel] [PATCH 5/6] android: camera_device: Create\n\trequest templates per use-case","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran, Laurent,\n\nOn Fri, Jul 24, 2020 at 07:00:45PM +0300, Laurent Pinchart wrote:\n> Hi Jacopo,\n>\n> Thank you for the patch.\n>\n> On Fri, Jul 24, 2020 at 04:21:19PM +0200, Jacopo Mondi wrote:\n> > Currently the request template returned from\n> > CameraDevice::constructDefaultRequestSettings() is the same for all\n> > the supported template types.\n> >\n> > To prepare to adjust the template depending on the use case, break out\n> > the template generation to dedicated function.\n>\n> s/dedicated/a dedicated/\n>\n> >\n> > As we currently support the PREVIEW use case only, make all the other\n> > template types use the captureTemplatePreview() function and just update\n> > the capture intent property. This requires a nasty const-cast on the\n> > generated template pack which will be removed once the functions will be\n> > properly populated.\n> >\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> >  src/android/camera_device.cpp | 146 +++++++++++++++++++++++++---------\n> >  src/android/camera_device.h   |   7 ++\n> >  2 files changed, 114 insertions(+), 39 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 48f8090a93db..b8cb118a960e 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -821,51 +821,15 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> >  \treturn staticMetadata_->get();\n> >  }\n> >\n> > -/*\n> > - * Produce a metadata pack to be used as template for a capture request.\n> > - */\n> > -const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> > +const CameraMetadata *CameraDevice::captureTemplatePreview()\n> >  {\n> > -\tauto it = requestTemplates_.find(type);\n> > -\tif (it != requestTemplates_.end())\n> > -\t\treturn it->second->get();\n> > -\n> > -\t/* Use the capture intent matching the requested template type. */\n> > -\tuint8_t captureIntent;\n> > -\tswitch (type) {\n> > -\tcase CAMERA3_TEMPLATE_PREVIEW:\n> > -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> > -\t\tbreak;\n> > -\tcase CAMERA3_TEMPLATE_STILL_CAPTURE:\n> > -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> > -\t\tbreak;\n> > -\tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> > -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> > -\t\tbreak;\n> > -\tcase CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:\n> > -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n> > -\t\tbreak;\n> > -\tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n> > -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG;\n> > -\t\tbreak;\n> > -\tcase CAMERA3_TEMPLATE_MANUAL:\n> > -\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n> > -\t\tbreak;\n> > -\tdefault:\n> > -\t\tLOG(HAL, Error) << \"Invalid template request type: \" << type;\n> > -\t\treturn nullptr;\n> > -\t}\n> > -\n> >  \t/*\n> >  \t * \\todo Keep this in sync with the actual number of entries.\n> >  \t * Currently: 12 entries, 15 bytes\n> >  \t */\n> >  \tCameraMetadata *requestTemplate = new CameraMetadata(15, 20);\n> > -\tif (!requestTemplate->isValid()) {\n> > -\t\tLOG(HAL, Error) << \"Failed to allocate template metadata\";\n> > -\t\tdelete requestTemplate;\n> > +\tif (!requestTemplate->isValid())\n\nI should delete here, as I wrongly assumed if !isValid() the metadata\nallocation failed hence there was no need to delete it. Although, the\nCameraMetadata instance should be deleted anyway\n\n> >  \t\treturn nullptr;\n> > -\t}\n> >\n> >  \tuint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;\n> >  \trequestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,\n> > @@ -911,10 +875,114 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> >  \trequestTemplate->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> >  \t\t\t\t  &aberrationMode, 1);\n> >\n> > +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> >  \trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n> >  \t\t\t\t  &captureIntent, 1);\n> >\n> > -\tif (!requestTemplate->isValid()) {\n> > +\treturn requestTemplate;\n> > +}\n> > +\n> > +const CameraMetadata *CameraDevice::captureTemplateStillCapture()\n> > +{\n> > +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> > +\tif (!requestTemplate || !requestTemplate->isValid())\n> > +\t\treturn nullptr;\n>\n> You'll leak requestTemplate here if it's not valid. You could just\n> return requestTemplate instead.\n>\n\nRight, I was betting on the constructDefaultRequestSettings() to do\nso, bu then I made all other functions call this one, and failed to\nupdate the clean up paths\n\n> > +\n> > +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> > +\tconst_cast<CameraMetadata *>(requestTemplate)\n> > +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n>\n> You could avoid the const_cast by making these functions return a\n> non-const pointer, and setting ANDROID_CONTROL_CAPTURE_INTENT in\n> CameraDevice::constructDefaultRequestSettings(). This function would\n> then just become\n>\n> \treturn captureTemplatePreview();\n>\n> and will be filled later.\n\nNot sure. I started with the intention of filling in all functions,\nthen I addressed Preview only, and made the others use it. I should\nprobably just call captureTemplatePreview() from all the switch cases\nin constructDefaultRequestSettings() for the time being, update\nCAPTURE_INTENT there, and replace each function with a new one as we\nsupport more template types. I think that's what v2 will look like.\n\n>\n> > +\n> > +\treturn requestTemplate;\n> > +}\n> > +\n> > +const CameraMetadata *CameraDevice::captureTemplateVideoRecord()\n> > +{\n> > +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> > +\tif (!requestTemplate || !requestTemplate->isValid())\n> > +\t\treturn nullptr;\n> > +\n> > +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> > +\tconst_cast<CameraMetadata *>(requestTemplate)\n> > +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> > +\n> > +\treturn requestTemplate;\n> > +}\n> > +\n> > +const CameraMetadata *CameraDevice::captureTemplateVideoSnapshot()\n> > +{\n> > +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> > +\tif (!requestTemplate || !requestTemplate->isValid())\n> > +\t\treturn nullptr;\n> > +\n> > +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n> > +\tconst_cast<CameraMetadata *>(requestTemplate)\n> > +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> > +\n> > +\treturn requestTemplate;\n> > +}\n> > +\n> > +const CameraMetadata *CameraDevice::captureTemplateZSL()\n> > +{\n> > +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> > +\tif (!requestTemplate || !requestTemplate->isValid())\n> > +\t\treturn nullptr;\n> > +\n> > +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG;\n> > +\tconst_cast<CameraMetadata *>(requestTemplate)\n> > +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> > +\n> > +\treturn requestTemplate;\n> > +}\n> > +\n> > +const CameraMetadata *CameraDevice::captureTemplateManual()\n> > +{\n> > +\tconst CameraMetadata *requestTemplate = captureTemplatePreview();\n> > +\tif (!requestTemplate || !requestTemplate->isValid())\n> > +\t\treturn nullptr;\n> > +\n> > +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n> > +\tconst_cast<CameraMetadata *>(requestTemplate)\n> > +\t\t->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1);\n> > +\n> > +\treturn requestTemplate;\n> > +}\n> > +\n> > +/*\n> > + * Produce a metadata pack to be used as template for a capture request.\n> > + */\n> > +const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> > +{\n> > +\tauto it = requestTemplates_.find(type);\n> > +\tif (it != requestTemplates_.end())\n> > +\t\treturn it->second->get();\n> > +\n> > +\t/* Use the capture intent matching the requested template type. */\n> > +\tconst CameraMetadata *requestTemplate;\n> > +\tswitch (type) {\n> > +\tcase CAMERA3_TEMPLATE_PREVIEW:\n> > +\t\trequestTemplate = captureTemplatePreview();\n> > +\t\tbreak;\n> > +\tcase CAMERA3_TEMPLATE_STILL_CAPTURE:\n> > +\t\trequestTemplate = captureTemplateStillCapture();\n> > +\t\tbreak;\n> > +\tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> > +\t\trequestTemplate = captureTemplateVideoRecord();\n> > +\t\tbreak;\n> > +\tcase CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:\n> > +\t\trequestTemplate = captureTemplateVideoSnapshot();\n> > +\t\tbreak;\n> > +\tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n> > +\t\trequestTemplate = captureTemplateZSL();\n> > +\t\tbreak;\n> > +\tcase CAMERA3_TEMPLATE_MANUAL:\n> > +\t\trequestTemplate = captureTemplateManual();\n> > +\t\tbreak;\n> > +\tdefault:\n> > +\t\tLOG(HAL, Error) << \"Invalid template request type: \" << type;\n> > +\t\treturn nullptr;\n> > +\t}\n> > +\n> > +\tif (!requestTemplate || !requestTemplate->isValid()) {\n> >  \t\tLOG(HAL, Error) << \"Failed to construct request template\";\n> >  \t\tdelete requestTemplate;\n> >  \t\treturn nullptr;\n> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > index af1b58ab6b4e..7bf68e23f7fe 100644\n> > --- a/src/android/camera_device.h\n> > +++ b/src/android/camera_device.h\n> > @@ -87,6 +87,13 @@ private:\n> >  \tstd::unique_ptr<CameraMetadata> getResultMetadata(int frame_number,\n> >  \t\t\t\t\t\t\t  int64_t timestamp);\n> >\n> > +\tconst CameraMetadata *captureTemplatePreview();\n> > +\tconst CameraMetadata *captureTemplateStillCapture();\n> > +\tconst CameraMetadata *captureTemplateVideoRecord();\n> > +\tconst CameraMetadata *captureTemplateVideoSnapshot();\n> > +\tconst CameraMetadata *captureTemplateZSL();\n> > +\tconst CameraMetadata *captureTemplateManual();\n> > +\n> >  \tunsigned int id_;\n> >  \tcamera3_device_t camera3Device_;\n> >\n>\n> --\n> Regards,\n>\n> Laurent Pinchart","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 D3DFEBD878\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 25 Jul 2020 12:30:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7622961253;\n\tSat, 25 Jul 2020 14:30:55 +0200 (CEST)","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 7606361223\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 25 Jul 2020 14:30:54 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id DA921E0007;\n\tSat, 25 Jul 2020 12:30:53 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Sat, 25 Jul 2020 14:34:31 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Message-ID":"<20200725123431.qshg6yio44iqq2zb@uno.localdomain>","References":"<20200724142120.95538-1-jacopo@jmondi.org>\n\t<20200724142120.95538-6-jacopo@jmondi.org>\n\t<20200724160045.GI5921@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200724160045.GI5921@pendragon.ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 5/6] android: camera_device: Create\n\trequest templates per use-case","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>"}}]