[{"id":18330,"web_url":"https://patchwork.libcamera.org/comment/18330/","msgid":"<YPy4H/y5cj2u4EP6@pendragon.ideasonboard.com>","date":"2021-07-25T01:02:23","subject":"Re: [libcamera-devel] [PATCH v5 8/9] android: Add skeletal still\n\tand manual request templates","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Tue, Jul 20, 2021 at 07:13:06PM +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 <paul.elder@ideasonboard.com>\n> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>\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 4048a94b..8c425138 100644\n> --- a/src/android/camera_capabilities.cpp\n> +++ b/src/android/camera_capabilities.cpp\n> @@ -1445,3 +1445,21 @@ std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplateVideo() const\n>  \n>  \treturn previewTemplate;\n>  }\n> +\n> +std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplateStill() const\n> +{\n> +\tstd::unique_ptr<CameraMetadata> stillTemplate = requestTemplatePreview();\n> +\tif (!stillTemplate)\n> +\t\treturn nullptr;\n> +\n> +\treturn stillTemplate;\n> +}\n> +\n> +std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplateManual() const\n> +{\n> +\tstd::unique_ptr<CameraMetadata> 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 e0c2786b..b9395544 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<CameraMetadata> requestTemplatePreview() const;\n>  \tstd::unique_ptr<CameraMetadata> requestTemplateVideo() const;\n> +\tstd::unique_ptr<CameraMetadata> requestTemplateStill() const;\n> +\tstd::unique_ptr<CameraMetadata> requestTemplateManual() const;\n\nI'd sort these alphabetically. Apart from that,\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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;","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 E7376C0109\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 25 Jul 2021 01:02:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 62BA0687B5;\n\tSun, 25 Jul 2021 03:02:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1044760274\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 25 Jul 2021 03:02:27 +0200 (CEST)","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 80D25255;\n\tSun, 25 Jul 2021 03:02:26 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"pg4D7FHQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627174946;\n\tbh=qCOHytADlrQLp1y4Oo7KTQ1kvad+2TLwrEdXOOhLOq8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=pg4D7FHQWIBmXmpf0nER0dTIE7RzdOXHvVlbP/w9OfUcwstDRhnLBi18vAv1ovvnf\n\tzWCcI+IIkDX8d70eCLZqXTrgSfsDBNAF1jVytR//+GDE2VQv/OuNhpowP1m50ZTBxN\n\tJgpqlEPcAtrE6AQUi0OjyZXPn7dikjuOrt27rARM=","Date":"Sun, 25 Jul 2021 04:02:23 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Paul Elder <paul.elder@ideasonboard.com>","Message-ID":"<YPy4H/y5cj2u4EP6@pendragon.ideasonboard.com>","References":"<20210720101307.26010-1-paul.elder@ideasonboard.com>\n\t<20210720101307.26010-9-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210720101307.26010-9-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v5 8/9] android: Add skeletal still\n\tand manual request templates","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]