{"id":11022,"url":"https://patchwork.libcamera.org/api/patches/11022/?format=json","web_url":"https://patchwork.libcamera.org/patch/11022/","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":"<20210126173008.446321-7-jacopo@jmondi.org>","date":"2021-01-26T17:30:08","name":"[libcamera-devel,v2,6/6] android: camera_device: Return AE FPS range","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3435325329cada11bcf6794fff0b770bdb2b745c","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/11022/mbox/","series":[{"id":1612,"url":"https://patchwork.libcamera.org/api/series/1612/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1612","date":"2021-01-26T17:30:02","name":"android: Report frame durations","version":2,"mbox":"https://patchwork.libcamera.org/series/1612/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11022/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11022/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 B2390BD808\n\tfor ;\n\tTue, 26 Jan 2021 17:29:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4ACA768318;\n\tTue, 26 Jan 2021 18:29:58 +0100 (CET)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 850D068328\n\tfor ;\n\tTue, 26 Jan 2021 18:29:55 +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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 3439DE0004\n\tfor ;\n\tTue, 26 Jan 2021 17:29:55 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 Jan 2021 18:30:08 +0100","Message-Id":"<20210126173008.446321-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210126173008.446321-1-jacopo@jmondi.org>","References":"<20210126173008.446321-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 6/6] android: camera_device: Return AE\n\tFPS range","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 result metadata reported an arbitrary {30, 30} FPS range for the\nAE algorithm.\n\nThe actual FPS range should be returned in the Request::metadata, but\nas libcamera currently does not support that feature temporary work\naround the issue and return the FPS range requested by the camera\nframework.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 19 ++++++++++++++++---\n 1 file changed, 16 insertions(+), 3 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex f3f59f7dcb77..6339ef257906 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1951,6 +1951,7 @@ std::unique_ptr\n CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \t\t\t\tint64_t timestamp)\n {\n+\tconst CameraMetadata &settings = descriptor->settings_;\n \tconst ControlList &metadata = descriptor->request_->metadata();\n \n \t/*\n@@ -1977,9 +1978,21 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \tvalue = ANDROID_CONTROL_AE_MODE_ON;\n \tresultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, &value, 1);\n \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+\tcamera_metadata_ro_entry_t entry;\n+\tbool found = settings.getEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE, &entry);\n+\tif (found) {\n+\t\t/*\n+\t\t * \\todo Retrieve the AE FPS range from the libcamera metadata.\n+\t\t * As libcamera does not support that control, as a temporary\n+\t\t * workaround return what the framework asked.\n+\t\t */\n+\t\tconst int32_t *data = entry.data.i32;\n+\t\tstd::vector aeFpsTarget = {\n+\t\t\tdata[0], data[1],\n+\t\t};\n+\t\tresultMetadata->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\t\t\t\t aeFpsTarget.data(), aeFpsTarget.size());\n+\t}\n \n \tvalue = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n \tresultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n","prefixes":["libcamera-devel","v2","6/6"]}