Patch Detail
Show a patch.
GET /api/1.1/patches/9006/?format=api
{ "id": 9006, "url": "https://patchwork.libcamera.org/api/1.1/patches/9006/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9006/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200725144058.129388-7-jacopo@jmondi.org>", "date": "2020-07-25T14:40:58", "name": "[libcamera-devel,v2,6/6] android: camera_device: Fix preview template", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "033f352fb10307d270c3d999653a85f72eaac93d", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9006/mbox/", "series": [ { "id": 1146, "url": "https://patchwork.libcamera.org/api/1.1/series/1146/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1146", "date": "2020-07-25T14:40:52", "name": "android: camera_device: Generate correct preview template", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1146/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9006/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9006/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 CAD5DBD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 25 Jul 2020 14:37:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 44012613B7;\n\tSat, 25 Jul 2020 16:37:32 +0200 (CEST)", "from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4E9E060399\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 25 Jul 2020 16:37:31 +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 relay10.mail.gandi.net (Postfix) with ESMTPSA id 8CE4C240004;\n\tSat, 25 Jul 2020 14:37:30 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 25 Jul 2020 16:40:58 +0200", "Message-Id": "<20200725144058.129388-7-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200725144058.129388-1-jacopo@jmondi.org>", "References": "<20200725144058.129388-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 6/6] android: camera_device: Fix\n\tpreview template", "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": "Add 5 controls to the generate preview template to comply with the\ncamera3 specification.\n\nThis change fixes CTS 9.0.r12 test:\nandroid.hardware.camera2.cts.CameraDeviceTest#testCameraDevicePreviewTemplate\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\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 b294b88367d4..d667c4f126f3 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -377,7 +377,7 @@ std::tuple<uint32_t, uint32_t> 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 @@ CameraMetadata *CameraDevice::requestTemplatePreview()\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\tdelete requestTemplate;\n \t\treturn nullptr;\n@@ -849,6 +854,17 @@ CameraMetadata *CameraDevice::requestTemplatePreview()\n \trequestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,\n \t\t\t\t &aeLock, 1);\n \n+\tstd::vector<int32_t> 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@@ -877,6 +893,16 @@ CameraMetadata *CameraDevice::requestTemplatePreview()\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", "v2", "6/6" ] }