{"id":11043,"url":"https://patchwork.libcamera.org/api/1.1/patches/11043/?format=json","web_url":"https://patchwork.libcamera.org/patch/11043/","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":"<20210128102140.160134-1-paul.elder@ideasonboard.com>","date":"2021-01-28T10:21:40","name":"[libcamera-devel,v2] android: camera_device: Set AE precapture trigger according to request","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4f97c54c7318ba553382548edd5abafe6bd6e0e1","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11043/mbox/","series":[{"id":1620,"url":"https://patchwork.libcamera.org/api/1.1/series/1620/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1620","date":"2021-01-28T10:21:40","name":"[libcamera-devel,v2] android: camera_device: Set AE precapture trigger according to request","version":2,"mbox":"https://patchwork.libcamera.org/series/1620/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11043/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11043/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 1FFF5BD808\n\tfor ;\n\tThu, 28 Jan 2021 10:21:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A32B068381;\n\tThu, 28 Jan 2021 11:21:52 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0D1C56030A\n\tfor ;\n\tThu, 28 Jan 2021 11:21:51 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6733F331;\n\tThu, 28 Jan 2021 11:21:49 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"iIw3tbhg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611829310;\n\tbh=lqhCP15e618bpmlbbzEZnOWfn/pXmM8lLbNT+DJhvzU=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=iIw3tbhgcnBEKNyJFGp+Qt88yopmTtAZdSJhUTZ+BicHEStO9Nq1QYbY0D4mml9El\n\tsmRQoTZ7EsQBsqqB4FrMLlcmeyByLdUjL6byyL+NkRYFcJF9ZdgvhkNeI6SAOjofwc\n\toGw7v99SrJgxZC2jJlBEdbYervjjk16uJL2gIl0U=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 Jan 2021 19:21:40 +0900","Message-Id":"<20210128102140.160134-1-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2] android: camera_device: Set AE\n\tprecapture trigger according to request","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":"Set the AE precapture triggler tag in the android result metadata\naccording to what was passed in the request metadata.\n\nThis allows the following CTS test to pass:\n- android.hardware.camera2.cts.StillCaptureTest#testAePrecaptureTriggerCancelJpegCapture\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v2:\n- move setting the tag to getResultMetadata()\n---\n src/android/camera_device.cpp | 10 ++++++----\n 1 file changed, 6 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 82bf0d3a..f5066709 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1965,8 +1965,11 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \t\t\t\t aeFpsTarget.data(), aeFpsTarget.size());\n \n \tvalue = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n-\tresultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n-\t\t\t\t &value, 1);\n+\tcamera_metadata_ro_entry_t entry;\n+\t/* \\todo Handle IPA appropriately */\n+\tbool ret = descriptor->settings_.getEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, &entry);\n+\tresultMetadata->updateEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n+\t\t\t\t ret ? entry.data.u8 : &value, 1);\n \n \tvalue = ANDROID_CONTROL_AE_STATE_CONVERGED;\n \tresultMetadata->addEntry(ANDROID_CONTROL_AE_STATE, &value, 1);\n@@ -2010,8 +2013,7 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \tvalue = ANDROID_FLASH_STATE_UNAVAILABLE;\n \tresultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);\n \n-\tcamera_metadata_ro_entry_t entry;\n-\tint ret = descriptor->settings_.getEntry(ANDROID_LENS_APERTURE, &entry);\n+\tret = descriptor->settings_.getEntry(ANDROID_LENS_APERTURE, &entry);\n \tif (ret)\n \t\tresultMetadata->addEntry(ANDROID_LENS_APERTURE, entry.data.f, 1);\n \n","prefixes":["libcamera-devel","v2"]}