{"id":8974,"url":"https://patchwork.libcamera.org/api/patches/8974/?format=json","web_url":"https://patchwork.libcamera.org/patch/8974/","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":"<20200724142120.95538-7-jacopo@jmondi.org>","date":"2020-07-24T14:21:20","name":"[libcamera-devel,6/6] android: camera_device: Fix preview template","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6c73d4725bbc3ceb73326da9ceaee5c251c212a4","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/8974/mbox/","series":[{"id":1137,"url":"https://patchwork.libcamera.org/api/series/1137/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1137","date":"2020-07-24T14:21:14","name":"android: camera_device: generate templates per use-case","version":1,"mbox":"https://patchwork.libcamera.org/series/1137/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8974/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8974/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 39127BD879\n\tfor ;\n\tFri, 24 Jul 2020 14:17:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0E3B061243;\n\tFri, 24 Jul 2020 16:17:55 +0200 (CEST)","from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 632BE6124B\n\tfor ;\n\tFri, 24 Jul 2020 16:17:52 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id D9A1F60005;\n\tFri, 24 Jul 2020 14:17:51 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Jul 2020 16:21:20 +0200","Message-Id":"<20200724142120.95538-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200724142120.95538-1-jacopo@jmondi.org>","References":"<20200724142120.95538-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 6/6] android: camera_device: Fix preview\n\ttemplate","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":"Add 5 controls to the generate preview template to comply with the\ncamera3 specification.\n\nThis change fixes CTS 9.0.r12 test [14/253]\nandroid.hardware.camera2.cts.CameraDeviceTest#testCameraDevicePreviewTemplate\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 32 +++++++++++++++++++++++++++++---\n 1 file changed, 29 insertions(+), 3 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex b8cb118a960e..58901a119c18 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -377,7 +377,7 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n \t * Currently: 50 entries, 647 bytes of static metadata\n \t */\n \tuint32_t numEntries = 50;\n-\tuint32_t byteSize = 647;\n+\tuint32_t byteSize = 667;\n \n \t/*\n \t * Calculate space occupation in bytes for dynamically built metadata\n@@ -779,6 +779,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\tANDROID_CONTROL_AE_MODE,\n \t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n \t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n \t\tANDROID_CONTROL_AE_LOCK,\n \t\tANDROID_CONTROL_AF_TRIGGER,\n \t\tANDROID_CONTROL_AWB_MODE,\n@@ -787,6 +789,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n \t\tANDROID_NOISE_REDUCTION_MODE,\n \t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n+\t\tANDROID_LENS_APERTURE,\n+\t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n+\t\tANDROID_CONTROL_MODE,\n \t\tANDROID_CONTROL_CAPTURE_INTENT,\n \t};\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n@@ -825,9 +830,9 @@ const CameraMetadata *CameraDevice::captureTemplatePreview()\n {\n \t/*\n \t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 12 entries, 15 bytes\n+\t * Currently: 20 entries, 35 bytes\n \t */\n-\tCameraMetadata *requestTemplate = new CameraMetadata(15, 20);\n+\tCameraMetadata *requestTemplate = new CameraMetadata(20, 35);\n \tif (!requestTemplate->isValid())\n \t\treturn nullptr;\n \n@@ -847,6 +852,17 @@ const CameraMetadata *CameraDevice::captureTemplatePreview()\n \trequestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,\n \t\t\t\t &aeLock, 1);\n \n+\tstd::vector aeFpsTarget = {\n+\t\t15, 30,\n+\t};\n+\trequestTemplate->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\t\t\t aeFpsTarget.data(),\n+\t\t\t\t aeFpsTarget.size());\n+\n+\tuint8_t aeAntibandingMode = ANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO;\n+\trequestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,\n+\t\t\t\t &aeAntibandingMode, 1);\n+\n \tuint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n \trequestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,\n \t\t\t\t &afTrigger, 1);\n@@ -875,6 +891,16 @@ const CameraMetadata *CameraDevice::captureTemplatePreview()\n \trequestTemplate->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n \t\t\t\t &aberrationMode, 1);\n \n+\tuint8_t controlMode = ANDROID_CONTROL_MODE_AUTO;\n+\trequestTemplate->addEntry(ANDROID_CONTROL_MODE, &controlMode, 1);\n+\n+\tfloat lensAperture = 2.53 / 100;\n+\trequestTemplate->addEntry(ANDROID_LENS_APERTURE, &lensAperture, 1);\n+\n+\tuint8_t opticalStabilization = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;\n+\trequestTemplate->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n+\t\t\t\t &opticalStabilization, 1);\n+\n \tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n \trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n \t\t\t\t &captureIntent, 1);\n","prefixes":["libcamera-devel","6/6"]}