[{"id":19128,"web_url":"https://patchwork.libcamera.org/comment/19128/","msgid":"<20210827090935.GK968527@pyrite.rasen.tech>","date":"2021-08-27T09:09:35","subject":"Re: [libcamera-devel] [PATCH] android: Refuse Manual template if\n\tnot supported","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Fri, Aug 27, 2021 at 09:47:15AM +0200, Jacopo Mondi wrote:\n> If the camera devices does not support the MANUAL_SENSOR capabilities\n> there is no point in generating a request template for the Manual\n> capture use case.\n> \n> This change fixes CTS tests\n> android.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceManualTemplate\n> android.hardware.camera2.cts.NativeCameraDeviceTest#testCameraDeviceCreateCaptureRequest\n> \n> For devices that do not support MANUAL_SENSOR capabilities.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Paul Elder \n\n> ---\n> src/android/camera_capabilities.cpp | 12 ++++++++----\n> src/android/camera_capabilities.h | 1 +\n> 2 files changed, 9 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\n> index bd661675c7cc..c16e755f4695 100644\n> --- a/src/android/camera_capabilities.cpp\n> +++ b/src/android/camera_capabilities.cpp\n> @@ -1271,13 +1271,12 @@ int CameraCapabilities::initializeStaticMetadata()\n> \t\t\t\t numOutStreams);\n> \n> \t/* Check capabilities */\n> -\tstd::set\n> -\t\tcapabilities = computeCapabilities();\n> +\tcapabilities_ = computeCapabilities();\n> \tstd::vector\n> -\t\tcapsVec(capabilities.begin(), capabilities.end());\n> +\t\tcapsVec(capabilities_.begin(), capabilities_.end());\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CAPABILITIES, capsVec);\n> \n> -\tcomputeHwLevel(capabilities);\n> +\tcomputeHwLevel(capabilities_);\n> \tstaticMetadata_->addEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, hwLevel_);\n> \n> \tLOG(HAL, Info)\n> @@ -1326,6 +1325,11 @@ PixelFormat CameraCapabilities::toPixelFormat(int format) const\n> \n> std::unique_ptr CameraCapabilities::requestTemplateManual() const\n> {\n> +\tif (!capabilities_.count(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {\n> +\t\tLOG(HAL, Error) << \"Manual template not supported\";\n> +\t\treturn nullptr;\n> +\t}\n> +\n> \tstd::unique_ptr manualTemplate = requestTemplatePreview();\n> \tif (!manualTemplate)\n> \t\treturn nullptr;\n> diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\n> index 576f1e7c7b46..a12596993ee5 100644\n> --- a/src/android/camera_capabilities.h\n> +++ b/src/android/camera_capabilities.h\n> @@ -70,6 +70,7 @@ private:\n> \tint orientation_;\n> \tbool rawStreamAvailable_;\n> \tcamera_metadata_enum_android_info_supported_hardware_level hwLevel_;\n> +\tstd::set capabilities_;\n> \n> \tstd::vector streamConfigurations_;\n> \tstd::map formatsMap_;\n> -- \n> 2.32.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 9CC8ABD87C\n\tfor ;\n\tFri, 27 Aug 2021 09:09:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D340D68932;\n\tFri, 27 Aug 2021 11:09:43 +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 DAB5068891\n\tfor ;\n\tFri, 27 Aug 2021 11:09:42 +0200 (CEST)","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 334FA5A1;\n\tFri, 27 Aug 2021 11:09:40 +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=\"l25HNVO0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630055382;\n\tbh=dtoKn4CnJAgHbmFbwAqaG14ezcynRWIt6+tdOND1a24=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=l25HNVO0gWnpPqp5Qz6/6pplpYWqremGee2s5Lk1KP/yNHVONcfL1IDAFbCxaWGhh\n\tMNHRTEq1MHTSs5xPNqUSkH8i1J1j/qHMVgVU21ktAqtbAuYuxmaO2w4WugY7CganPF\n\thmkfYbUFsg2BF2v1C/78EoDC1WJAm8dVKq3N88No=","Date":"Fri, 27 Aug 2021 18:09:35 +0900","From":"paul.elder@ideasonboard.com","To":"Jacopo Mondi ","Message-ID":"<20210827090935.GK968527@pyrite.rasen.tech>","References":"<20210827074715.65537-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20210827074715.65537-1-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH] android: Refuse Manual template if\n\tnot supported","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\" "}},{"id":19181,"web_url":"https://patchwork.libcamera.org/comment/19181/","msgid":"","date":"2021-08-30T16:19:48","subject":"Re: [libcamera-devel] [PATCH] android: Refuse Manual template if\n\tnot supported","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, Aug 27, 2021 at 09:47:15AM +0200, Jacopo Mondi wrote:\n> If the camera devices does not support the MANUAL_SENSOR capabilities\n> there is no point in generating a request template for the Manual\n> capture use case.\n> \n> This change fixes CTS tests\n> android.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceManualTemplate\n> android.hardware.camera2.cts.NativeCameraDeviceTest#testCameraDeviceCreateCaptureRequest\n> \n> For devices that do not support MANUAL_SENSOR capabilities.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/android/camera_capabilities.cpp | 12 ++++++++----\n> src/android/camera_capabilities.h | 1 +\n> 2 files changed, 9 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\n> index bd661675c7cc..c16e755f4695 100644\n> --- a/src/android/camera_capabilities.cpp\n> +++ b/src/android/camera_capabilities.cpp\n> @@ -1271,13 +1271,12 @@ int CameraCapabilities::initializeStaticMetadata()\n> \t\t\t\t numOutStreams);\n> \n> \t/* Check capabilities */\n> -\tstd::set\n> -\t\tcapabilities = computeCapabilities();\n> +\tcapabilities_ = computeCapabilities();\n> \tstd::vector\n> -\t\tcapsVec(capabilities.begin(), capabilities.end());\n> +\t\tcapsVec(capabilities_.begin(), capabilities_.end());\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CAPABILITIES, capsVec);\n> \n> -\tcomputeHwLevel(capabilities);\n> +\tcomputeHwLevel(capabilities_);\n> \tstaticMetadata_->addEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, hwLevel_);\n> \n> \tLOG(HAL, Info)\n> @@ -1326,6 +1325,11 @@ PixelFormat CameraCapabilities::toPixelFormat(int format) const\n> \n> std::unique_ptr CameraCapabilities::requestTemplateManual() const\n> {\n> +\tif (!capabilities_.count(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {\n> +\t\tLOG(HAL, Error) << \"Manual template not supported\";\n> +\t\treturn nullptr;\n> +\t}\n> +\n> \tstd::unique_ptr manualTemplate = requestTemplatePreview();\n> \tif (!manualTemplate)\n> \t\treturn nullptr;\n> diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\n> index 576f1e7c7b46..a12596993ee5 100644\n> --- a/src/android/camera_capabilities.h\n> +++ b/src/android/camera_capabilities.h\n> @@ -70,6 +70,7 @@ private:\n> \tint orientation_;\n> \tbool rawStreamAvailable_;\n> \tcamera_metadata_enum_android_info_supported_hardware_level hwLevel_;\n> +\tstd::set capabilities_;\n> \n> \tstd::vector streamConfigurations_;\n> \tstd::map formatsMap_;","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 213E3BDC71\n\tfor ;\n\tMon, 30 Aug 2021 16:20:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E1BE06916A;\n\tMon, 30 Aug 2021 18:20:03 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 50DE260258\n\tfor ;\n\tMon, 30 Aug 2021 18:20:02 +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 E06555A7;\n\tMon, 30 Aug 2021 18:20:01 +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=\"rxlmEcnI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630340402;\n\tbh=8E/zkfIRzETzJpzWxnJlHjWtGVzM04k3WQQun3v6vDE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=rxlmEcnIWrYTNVYv/TnhJ4ut+PHqcLVgcJSECJuI5OMlTirqvw5C0juWL8Soz3w5M\n\txSBrdJh5rVZSkCicshW6gL+SU1fQ6fYoBfBN9jib+nOYNT7JwMC9ryvOJH9p9OCtQQ\n\to5haCJTUkqshe0+wAwAo++sIYku3hae+wOS9Om2k=","Date":"Mon, 30 Aug 2021 19:19:48 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210827074715.65537-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210827074715.65537-1-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH] android: Refuse Manual template if\n\tnot supported","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\" "}}]