[{"id":18212,"web_url":"https://patchwork.libcamera.org/comment/18212/","msgid":"<20210717101623.dkkmrmdapa4dknb2@uno.localdomain>","date":"2021-07-17T10:16:23","subject":"Re: [libcamera-devel] [RFC PATCH v4 08/21] android: Add skeletal\n\tstill and manual request templates","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"On Fri, Jul 16, 2021 at 07:56:18PM +0900, Paul Elder wrote:\n> Add skeletal still and manual request templates so that we can expand\n> them for FULL support.\n>\n> Signed-off-by: Paul Elder \n> ---\n> src/android/camera_capabilities.cpp | 18 ++++++++++++++++++\n> src/android/camera_capabilities.h | 2 ++\n> src/android/camera_device.cpp | 7 +++++--\n> 3 files changed, 25 insertions(+), 2 deletions(-)\n>\n> diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\n> index 09b3d82d..21e31cf2 100644\n> --- a/src/android/camera_capabilities.cpp\n> +++ b/src/android/camera_capabilities.cpp\n> @@ -1443,3 +1443,21 @@ std::unique_ptr CameraCapabilities::requestTemplateVideo() const\n>\n> \treturn previewTemplate;\n> }\n> +\n> +std::unique_ptr CameraCapabilities::requestTemplateStill() const\n> +{\n> +\tstd::unique_ptr stillTemplate = requestTemplatePreview();\n> +\tif (!stillTemplate)\n> +\t\treturn nullptr;\n\nYou could directly return the requestTemplatePreview() function return value.\nAnyway, looks good\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> +\n> +\treturn stillTemplate;\n> +}\n> +\n> +std::unique_ptr CameraCapabilities::requestTemplateManual() const\n> +{\n> +\tstd::unique_ptr manualTemplate = requestTemplatePreview();\n> +\tif (!manualTemplate)\n> +\t\treturn nullptr;\n> +\n> +\treturn manualTemplate;\n> +}\n> diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\n> index cf68539b..52a203c8 100644\n> --- a/src/android/camera_capabilities.h\n> +++ b/src/android/camera_capabilities.h\n> @@ -34,6 +34,8 @@ public:\n>\n> \tstd::unique_ptr requestTemplatePreview() const;\n> \tstd::unique_ptr requestTemplateVideo() const;\n> +\tstd::unique_ptr requestTemplateStill() const;\n> +\tstd::unique_ptr requestTemplateManual() const;\n>\n> private:\n> \tLIBCAMERA_DISABLE_COPY_AND_MOVE(CameraCapabilities)\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 678cde23..692d0a5b 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -487,7 +487,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> \t\t * for the torch mode we currently do not support.\n> \t\t */\n> \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> -\t\trequestTemplate = capabilities_.requestTemplatePreview();\n> +\t\trequestTemplate = capabilities_.requestTemplateStill();\n> \t\tbreak;\n> \tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> @@ -497,9 +497,12 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n> \t\trequestTemplate = capabilities_.requestTemplateVideo();\n> \t\tbreak;\n> +\tcase CAMERA3_TEMPLATE_MANUAL:\n> +\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n> +\t\trequestTemplate = capabilities_.requestTemplateManual();\n> +\t\tbreak;\n> \t/* \\todo Implement templates generation for the remaining use cases. */\n> \tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n> -\tcase CAMERA3_TEMPLATE_MANUAL:\n> \tdefault:\n> \t\tLOG(HAL, Error) << \"Unsupported template request type: \" << type;\n> \t\treturn nullptr;\n> --\n> 2.27.0\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 9419DC0109\n\tfor ;\n\tSat, 17 Jul 2021 10:15:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E63126853A;\n\tSat, 17 Jul 2021 12:15:38 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 38F696027B\n\tfor ;\n\tSat, 17 Jul 2021 12:15:37 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id A00A11BF205;\n\tSat, 17 Jul 2021 10:15:36 +0000 (UTC)"],"Date":"Sat, 17 Jul 2021 12:16:23 +0200","From":"Jacopo Mondi ","To":"Paul Elder ","Message-ID":"<20210717101623.dkkmrmdapa4dknb2@uno.localdomain>","References":"<20210716105631.158153-1-paul.elder@ideasonboard.com>\n\t<20210716105631.158153-9-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210716105631.158153-9-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH v4 08/21] android: Add skeletal\n\tstill and manual request templates","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]