Patch Detail
Show a patch.
GET /api/1.1/patches/10822/?format=api
{ "id": 10822, "url": "https://patchwork.libcamera.org/api/1.1/patches/10822/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10822/", "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": "<20210105190522.682324-9-jacopo@jmondi.org>", "date": "2021-01-05T19:05:18", "name": "[libcamera-devel,08/12] android: camera_device: Register MAX_DIGITAL_ZOOM", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d13294675fcef23b59a05916ccf63cb18116a84d", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": { "id": 15, "url": "https://patchwork.libcamera.org/api/1.1/users/15/?format=api", "username": "jmondi", "first_name": "Jacopo", "last_name": "Mondi", "email": "jacopo@jmondi.org" }, "mbox": "https://patchwork.libcamera.org/patch/10822/mbox/", "series": [ { "id": 1568, "url": "https://patchwork.libcamera.org/api/1.1/series/1568/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1568", "date": "2021-01-05T19:05:10", "name": "android: Exposure times + scaler crop + android metadata", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1568/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10822/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10822/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 6E663C0F1A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 5 Jan 2021 19:05:20 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 11FEA63411;\n\tTue, 5 Jan 2021 20:05:20 +0100 (CET)", "from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F307162D3E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 5 Jan 2021 20:05:16 +0100 (CET)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id B0B7B100003\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 5 Jan 2021 19:05:16 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 5 Jan 2021 20:05:18 +0100", "Message-Id": "<20210105190522.682324-9-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.29.2", "In-Reply-To": "<20210105190522.682324-1-jacopo@jmondi.org>", "References": "<20210105190522.682324-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 08/12] android: camera_device: Register\n\tMAX_DIGITAL_ZOOM", "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": "Register the ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM static metadata\ninspecting the ScalerCrop control's limits.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 23 ++++++++++++++++++++---\n 1 file changed, 20 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex e6cee75581f2..99297270598f 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1011,9 +1011,26 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t}\n \n \t/* Scaler static metadata. */\n-\tfloat maxDigitalZoom = 1;\n-\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n-\t\t\t\t &maxDigitalZoom, 1);\n+\t{\n+\t\t/*\n+\t\t * \\todo The digital zoom factor is a property that depends\n+\t\t * on the desired output configuration and the sensor frame size\n+\t\t * input to the ISP. These information are not available to the\n+\t\t * Android HAL, not at initialization time at least.\n+\t\t *\n+\t\t * Rely on pipeline handlers initializing the ScalerCrop control\n+\t\t * with the camera default configuration and use the maximum\n+\t\t * and minimum crop rectangles to calculate the digital zoom\n+\t\t * factor.\n+\t\t */\n+\t\tconst auto info = controlsInfo.find(&controls::ScalerCrop);\n+\t\tRectangle min = info->second.min().get<Rectangle>();\n+\t\tRectangle max = info->second.max().get<Rectangle>();\n+\t\tfloat maxZoom = std::min<float>(1.0f * max.width / min.width,\n+\t\t\t\t\t\t1.0f * max.height / min.height);\n+\t\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n+\t\t\t\t\t &maxZoom, 1);\n+\t}\n \n \tstd::vector<uint32_t> availableStreamConfigurations;\n \tavailableStreamConfigurations.reserve(streamConfigurations_.size() * 4);\n", "prefixes": [ "libcamera-devel", "08/12" ] }