Patch Detail
Show a patch.
GET /api/patches/11049/?format=api
{ "id": 11049, "url": "https://patchwork.libcamera.org/api/patches/11049/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11049/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210129060255.13613-1-paul.elder@ideasonboard.com>", "date": "2021-01-29T06:02:55", "name": "[libcamera-devel,v3] android: camera_device: Set AE precapture trigger according to request", "commit_ref": "958c80a4f1c28301ce19112e04de55a6a5102dad", "pull_url": null, "state": "accepted", "archived": false, "hash": "9adc2895cc2b30b88b66897004fc056d400f42ed", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11049/mbox/", "series": [ { "id": 1624, "url": "https://patchwork.libcamera.org/api/series/1624/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1624", "date": "2021-01-29T06:02:55", "name": "[libcamera-devel,v3] android: camera_device: Set AE precapture trigger according to request", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1624/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11049/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11049/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 C0171C33BB\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 29 Jan 2021 06:03:07 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9274968393;\n\tFri, 29 Jan 2021 07:03:07 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 06F9F60307\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 29 Jan 2021 07:03:06 +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 2EA7B2E0;\n\tFri, 29 Jan 2021 07:03:03 +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=\"Lm4P2qXw\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611900185;\n\tbh=yEf/necxrywr+Rl1SLYdNYGFNiBT7WV+B8ZZ8IQk/rA=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=Lm4P2qXwG2/ydGFUFkLoV0wzR+sSqUr9jyyHdkl1Ebi83iSyWlRTrx5VMJrG2037f\n\trf5OP7wFWma8r2rx1rg0LDToklybE947s+EfGleVO4Y4mxDAC2xg13E2wsxYv9rrkW\n\tXYes/DKby3dZTxu9B+4U5reaO6650EhOI9nIiNZU=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 29 Jan 2021 15:02:55 +0900", "Message-Id": "<20210129060255.13613-1-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <paul.elder@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\n---\nChanges in v3:\n- fix updateEntry to addEntry\n- move camera_metadata_ro_entry_t entry to top of the function\n\nChanges in v2:\n- move setting the tag to getResultMetadata()\n---\n src/android/camera_device.cpp | 8 +++++---\n 1 file changed, 5 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 82bf0d3a..741dc8cf 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1927,6 +1927,7 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \t\t\t\tint64_t timestamp)\n {\n \tconst ControlList &metadata = descriptor->request_->metadata();\n+\tcamera_metadata_ro_entry_t entry;\n \n \t/*\n \t * \\todo Keep this in sync with the actual number of entries.\n@@ -1965,8 +1966,10 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \t\t\t\t aeFpsTarget.data(), aeFpsTarget.size());\n \n \tvalue = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n+\t/* \\todo Handle IPA appropriately */\n+\tbool ret = descriptor->settings_.getEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, &entry);\n \tresultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n-\t\t\t\t &value, 1);\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", "v3" ] }