{"id":10899,"url":"https://patchwork.libcamera.org/api/patches/10899/?format=json","web_url":"https://patchwork.libcamera.org/patch/10899/","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":"<20210119143711.153517-12-jacopo@jmondi.org>","date":"2021-01-19T14:37:11","name":"[libcamera-devel,v2,11/11] android: camera_device: Report the required dynamic metadata","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"90c933377d8849596d7f905afdf0f23e920ae7c5","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/10899/mbox/","series":[{"id":1584,"url":"https://patchwork.libcamera.org/api/series/1584/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1584","date":"2021-01-19T14:37:00","name":"android: Exposure times + scaler crop + android metadata","version":2,"mbox":"https://patchwork.libcamera.org/series/1584/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10899/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10899/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 44B01BD808\n\tfor ;\n\tTue, 19 Jan 2021 14:37:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0CE5E68174;\n\tTue, 19 Jan 2021 15:37:07 +0100 (CET)","from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C27EE68161\n\tfor ;\n\tTue, 19 Jan 2021 15:37:01 +0100 (CET)","from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 839C0C0007\n\tfor ;\n\tTue, 19 Jan 2021 14:37:01 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 19 Jan 2021 15:37:11 +0100","Message-Id":"<20210119143711.153517-12-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20210119143711.153517-1-jacopo@jmondi.org>","References":"<20210119143711.153517-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 11/11] android: camera_device: Report\n\tthe required dynamic metadata","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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The list of dynamic metadata reported by the Camera HAL is currently\nvery limited.\n\nAugment the number of reported metadata in order to fix errors\nreported by the android.hardware.camera2.cts.CaptureRequestTest test\nmodule.\n\nThe test module still fails in 2 tests because of the missing\nandroid.sensor.info.maxFrameDuration static metadata.\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 133 ++++++++++++++++++++++++++--------\n 1 file changed, 104 insertions(+), 29 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 759625b35963..d41c16cdf3ae 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -675,10 +675,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, 714 bytes of static metadata\n+\t * Currently: 53 entries, 782 bytes of static metadata\n \t */\n \tuint32_t numEntries = 53;\n-\tuint32_t byteSize = 714;\n+\tuint32_t byteSize = 782;\n \n \t/*\n \t * Calculate space occupation in bytes for dynamically built metadata\n@@ -1204,19 +1204,36 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\t availableRequestKeys.size());\n \n \tstd::vector availableResultKeys = {\n-\t\tANDROID_CONTROL_AE_STATE,\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE,\n \t\tANDROID_CONTROL_AE_LOCK,\n+\t\tANDROID_CONTROL_AE_MODE,\n+\t\tANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\tANDROID_CONTROL_AE_STATE,\n+\t\tANDROID_CONTROL_AF_MODE,\n \t\tANDROID_CONTROL_AF_STATE,\n-\t\tANDROID_CONTROL_AWB_STATE,\n+\t\tANDROID_CONTROL_AF_TRIGGER,\n+\t\tANDROID_CONTROL_AWB_MODE,\n \t\tANDROID_CONTROL_AWB_LOCK,\n+\t\tANDROID_CONTROL_AWB_STATE,\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_FLASH_STATE,\n \t\tANDROID_LENS_STATE,\n-\t\tANDROID_REQUEST_PIPELINE_DEPTH,\n-\t\tANDROID_SCALER_CROP_REGION,\n+\t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n \t\tANDROID_SENSOR_TIMESTAMP,\n \t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n \t\tANDROID_SENSOR_EXPOSURE_TIME,\n+\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n \t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n \t\tANDROID_STATISTICS_SCENE_FLICKER,\n+\t\tANDROID_NOISE_REDUCTION_MODE,\n+\t\tANDROID_REQUEST_PIPELINE_DEPTH,\n+\t\tANDROID_SCALER_CROP_REGION,\n \t\tANDROID_JPEG_SIZE,\n \t\tANDROID_JPEG_QUALITY,\n \t\tANDROID_JPEG_ORIENTATION,\n@@ -1889,48 +1906,106 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \n \t/*\n \t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 18 entries, 62 bytes\n+\t * Currently: 33 entries, 75 bytes\n+\t *\n+\t * Reserve more space for the JPEG metadata set by the post-processor.\n+\t * Currently: ANDROID_JPEG_SIZE (int32_t), ANDROID_JPEG_QUALITY (byte),\n+\t * ANDROID_JPEG_ORIENTATION (int32_t) = 3 entries, 9 bytes.\n \t */\n \tstd::unique_ptr resultMetadata =\n-\t\tstd::make_unique(19, 63);\n+\t\tstd::make_unique(33, 75);\n \tif (!resultMetadata->isValid()) {\n \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n \t\treturn nullptr;\n \t}\n \n-\tconst uint8_t ae_state = ANDROID_CONTROL_AE_STATE_CONVERGED;\n-\tresultMetadata->addEntry(ANDROID_CONTROL_AE_STATE, &ae_state, 1);\n+\tuint8_t value = ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_AE_LOCK_OFF;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_AE_MODE_ON;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, &value, 1);\n \n-\tconst uint8_t ae_lock = ANDROID_CONTROL_AE_LOCK_OFF;\n-\tresultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, &ae_lock, 1);\n+\tstd::vector aeFpsTarget = { 30, 30 };\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\t\t\t aeFpsTarget.data(), aeFpsTarget.size());\n \n-\tuint8_t af_state = ANDROID_CONTROL_AF_STATE_INACTIVE;\n-\tresultMetadata->addEntry(ANDROID_CONTROL_AF_STATE, &af_state, 1);\n+\tvalue = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\t\t\t &value, 1);\n \n-\tconst uint8_t awb_state = ANDROID_CONTROL_AWB_STATE_CONVERGED;\n-\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_STATE, &awb_state, 1);\n+\tvalue = ANDROID_CONTROL_AE_STATE_CONVERGED;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AE_STATE, &value, 1);\n \n-\tconst uint8_t awb_lock = ANDROID_CONTROL_AWB_LOCK_OFF;\n-\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, &awb_lock, 1);\n+\tvalue = ANDROID_CONTROL_AF_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AF_MODE, &value, 1);\n \n-\tconst uint8_t lens_state = ANDROID_LENS_STATE_STATIONARY;\n-\tresultMetadata->addEntry(ANDROID_LENS_STATE, &lens_state, 1);\n+\tvalue = ANDROID_CONTROL_AF_STATE_INACTIVE;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AF_STATE, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AF_TRIGGER, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_AWB_MODE_AUTO;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_AWB_LOCK_OFF;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_AWB_STATE_CONVERGED;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_STATE, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_CAPTURE_INTENT, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_EFFECT_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_EFFECT_MODE, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_MODE_AUTO;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_MODE, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_SCENE_MODE_DISABLED;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_SCENE_MODE, &value, 1);\n+\n+\tvalue = ANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_CONTROL_VIDEO_STABILIZATION_MODE, &value, 1);\n+\n+\tvalue = ANDROID_FLASH_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_FLASH_MODE, &value, 1);\n+\n+\tvalue = ANDROID_FLASH_STATE_UNAVAILABLE;\n+\tresultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);\n+\n+\tvalue = ANDROID_LENS_STATE_STATIONARY;\n+\tresultMetadata->addEntry(ANDROID_LENS_STATE, &value, 1);\n+\n+\tvalue = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n+\t\t\t\t &value, 1);\n \n \tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, ×tamp, 1);\n \n-\t/* 33.3 msec */\n-\tconst int64_t rolling_shutter_skew = 33300000;\n-\tresultMetadata->addEntry(ANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n-\t\t\t\t &rolling_shutter_skew, 1);\n+\tvalue = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n+\t\t\t\t &value, 1);\n \n-\tconst uint8_t lens_shading_map_mode =\n-\t\t\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n+\tvalue = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n \tresultMetadata->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n-\t\t\t\t &lens_shading_map_mode, 1);\n+\t\t\t\t &value, 1);\n \n-\tconst uint8_t scene_flicker = ANDROID_STATISTICS_SCENE_FLICKER_NONE;\n+\tvalue = ANDROID_STATISTICS_SCENE_FLICKER_NONE;\n \tresultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER,\n-\t\t\t\t &scene_flicker, 1);\n+\t\t\t\t &value, 1);\n+\n+\tvalue = ANDROID_NOISE_REDUCTION_MODE_OFF;\n+\tresultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, &value, 1);\n+\n+\t/* 33.3 msec */\n+\tconst int64_t rolling_shutter_skew = 33300000;\n+\tresultMetadata->addEntry(ANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n+\t\t\t\t &rolling_shutter_skew, 1);\n \n \t/* Add metadata tags reported by libcamera. */\n \tif (metadata.contains(controls::draft::PipelineDepth)) {\n","prefixes":["libcamera-devel","v2","11/11"]}