{"id":13534,"url":"https://patchwork.libcamera.org/api/1.1/patches/13534/?format=json","web_url":"https://patchwork.libcamera.org/patch/13534/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210827074715.65537-1-jacopo@jmondi.org>","date":"2021-08-27T07:47:15","name":"[libcamera-devel] android: Refuse Manual template if not supported","commit_ref":"88009711be33903672e45b89cf5c9d3fc5761724","pull_url":null,"state":"accepted","archived":false,"hash":"b063f44ee2b27536b649215d0825ad792b89c3ea","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13534/mbox/","series":[{"id":2406,"url":"https://patchwork.libcamera.org/api/1.1/series/2406/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2406","date":"2021-08-27T07:47:15","name":"[libcamera-devel] android: Refuse Manual template if not supported","version":1,"mbox":"https://patchwork.libcamera.org/series/2406/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13534/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13534/checks/","tags":{},"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 C7429BD87C\n\tfor ;\n\tFri, 27 Aug 2021 07:46:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2B8BC68932;\n\tFri, 27 Aug 2021 09:46:34 +0200 (CEST)","from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E03B668891\n\tfor ;\n\tFri, 27 Aug 2021 09:46:32 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 1377520008;\n\tFri, 27 Aug 2021 07:46:31 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 27 Aug 2021 09:47:15 +0200","Message-Id":"<20210827074715.65537-1-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.32.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] android: Refuse Manual template if not\n\tsupported","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"If the camera devices does not support the MANUAL_SENSOR capabilities\nthere is no point in generating a request template for the Manual\ncapture use case.\n\nThis change fixes CTS tests\nandroid.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceManualTemplate\nandroid.hardware.camera2.cts.NativeCameraDeviceTest#testCameraDeviceCreateCaptureRequest\n\nFor devices that do not support MANUAL_SENSOR capabilities.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_capabilities.cpp | 12 ++++++++----\n src/android/camera_capabilities.h | 1 +\n 2 files changed, 9 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 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;\ndiff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\nindex 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","prefixes":["libcamera-devel"]}