{"id":11058,"url":"https://patchwork.libcamera.org/api/patches/11058/?format=json","web_url":"https://patchwork.libcamera.org/patch/11058/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210129142615.669464-3-jacopo@jmondi.org>","date":"2021-01-29T14:26:14","name":"[libcamera-devel,2/3] android: camera_device: Add missing request keys","commit_ref":"da4b325f41fc488df54a1cfc9ab4eaf0a5dda522","pull_url":null,"state":"accepted","archived":false,"hash":"44652b83cb7fe07b541c6b0796b5e2415aacf32c","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11058/mbox/","series":[{"id":1626,"url":"https://patchwork.libcamera.org/api/series/1626/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1626","date":"2021-01-29T14:26:12","name":"android: Add missing Request keys","version":1,"mbox":"https://patchwork.libcamera.org/series/1626/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11058/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11058/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 100C2C33BB\n\tfor ;\n\tFri, 29 Jan 2021 14:26:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DC3E0683B8;\n\tFri, 29 Jan 2021 15:26:03 +0100 (CET)","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 147C8683A8\n\tfor ;\n\tFri, 29 Jan 2021 15:26:00 +0100 (CET)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id D7C6220008\n\tfor ;\n\tFri, 29 Jan 2021 14:25:59 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 29 Jan 2021 15:26:14 +0100","Message-Id":"<20210129142615.669464-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210129142615.669464-1-jacopo@jmondi.org>","References":"<20210129142615.669464-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 2/3] android: camera_device: Add missing\n\trequest keys","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Camera HAL does not report all the Request keys which are\nmandatory for the advertised BACKWARD_COMPATIBLE capabilities\nlevel. Add them.\n\nThis fixes the CTS test:\nandroid.hardware.camera2.cts.StaticMetadataTest#testCapabilities\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 13 +++++++++++--\n 1 file changed, 11 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 83e2734541e3..b66e7c71884a 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -705,10 +705,10 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n {\n \t/*\n \t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 53 entries, 782 bytes of static metadata\n+\t * Currently: 53 entries, 846 bytes of static metadata\n \t */\n \tuint32_t numEntries = 53;\n-\tuint32_t byteSize = 810;\n+\tuint32_t byteSize = 846;\n \n \t/*\n \t * Calculate space occupation in bytes for dynamically built metadata\n@@ -1218,15 +1218,24 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\tANDROID_CONTROL_AE_MODE,\n \t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n \t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\tANDROID_CONTROL_AF_MODE,\n \t\tANDROID_CONTROL_AF_TRIGGER,\n \t\tANDROID_CONTROL_AWB_LOCK,\n \t\tANDROID_CONTROL_AWB_MODE,\n \t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t\tANDROID_CONTROL_EFFECT_MODE,\n \t\tANDROID_CONTROL_MODE,\n+\t\tANDROID_CONTROL_SCENE_MODE,\n+\t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n \t\tANDROID_FLASH_MODE,\n+\t\tANDROID_JPEG_ORIENTATION,\n+\t\tANDROID_JPEG_QUALITY,\n+\t\tANDROID_JPEG_THUMBNAIL_QUALITY,\n+\t\tANDROID_JPEG_THUMBNAIL_SIZE,\n \t\tANDROID_LENS_APERTURE,\n \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n \t\tANDROID_NOISE_REDUCTION_MODE,\n+\t\tANDROID_SCALER_CROP_REGION,\n \t\tANDROID_STATISTICS_FACE_DETECT_MODE\n \t};\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n","prefixes":["libcamera-devel","2/3"]}