Patch Detail
Show a patch.
GET /api/1.1/patches/10824/?format=api
{ "id": 10824, "url": "https://patchwork.libcamera.org/api/1.1/patches/10824/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10824/", "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-11-jacopo@jmondi.org>", "date": "2021-01-05T19:05:20", "name": "[libcamera-devel,10/12] android: camera_device: Handle SCALER_CROP_REGION", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c9670ec01a58a60e22db74478cfa3f7f3d96ced0", "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/10824/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/10824/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10824/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 C99E9C0F1D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 5 Jan 2021 19:05:21 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9D55563494;\n\tTue, 5 Jan 2021 20:05:21 +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 C5FDD6220D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 5 Jan 2021 20:05:17 +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 85775100002\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 5 Jan 2021 19:05:17 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 5 Jan 2021 20:05:20 +0100", "Message-Id": "<20210105190522.682324-11-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 10/12] android: camera_device: Handle\n\tSCALER_CROP_REGION", "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": "Handle the SCALER_CROP_REGION control and dynamic metadata by\ntranslating it from the Android format to the associated libcamera\ncontrol when processing a request, and the other way around when\nhandling a request completion.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 52 +++++++++++++++++++++++++++++++----\n src/android/camera_device.h | 2 ++\n src/android/camera_worker.h | 1 +\n 3 files changed, 49 insertions(+), 6 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 99297270598f..5f5e6576365b 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1586,6 +1586,35 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer\n \treturn new FrameBuffer(std::move(planes));\n }\n \n+int CameraDevice::processControls(camera3_capture_request_t *camera3Request,\n+\t\t\t\t Camera3RequestDescriptor *descriptor)\n+{\n+\tif (!camera3Request->settings)\n+\t\treturn 0;\n+\n+\t/*\n+\t * Translate the Android controls to libcamera.\n+\t *\n+\t * \\todo As soon as more controls are handled, this part should be\n+\t * broke out to a dedicated function.\n+\t */\n+\tconst camera_metadata_t *camera3Settings = camera3Request->settings;\n+\tcamera_metadata_ro_entry_t entry;\n+\tint ret = find_camera_metadata_ro_entry(camera3Settings,\n+\t\t\t\t\t\tANDROID_SCALER_CROP_REGION,\n+\t\t\t\t\t\t&entry);\n+\tif (!ret) {\n+\t\tconst int32_t *data = entry.data.i32;\n+\t\tRectangle cropRegion = { data[0], data[1],\n+\t\t\t\t\t static_cast<unsigned int>(data[2]),\n+\t\t\t\t\t static_cast<unsigned int>(data[3]) };\n+\t\tControlList &controls = descriptor->request_->controls();\n+\t\tcontrols.set(controls::ScalerCrop, cropRegion);\n+\t}\n+\n+\treturn 0;\n+}\n+\n int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n {\n \tif (!camera3Request) {\n@@ -1697,7 +1726,14 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t\t\t\tcamera3Buffers[i].acquire_fence);\n \t}\n \n-\t/* Queue the request to the CameraWorker. */\n+\t/*\n+\t * Translate controls from Android to libcamera and queue the request\n+\t * to the CameraWorker thread.\n+\t */\n+\tint ret = processControls(camera3Request, descriptor);\n+\tif (ret)\n+\t\treturn ret;\n+\n \tworker_.queueRequest(descriptor->request_.get());\n \n \treturn 0;\n@@ -1876,11 +1912,6 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \tconst uint8_t lens_state = ANDROID_LENS_STATE_STATIONARY;\n \tresultMetadata->addEntry(ANDROID_LENS_STATE, &lens_state, 1);\n \n-\tint32_t sensorSizes[] = {\n-\t\t0, 0, 2560, 1920,\n-\t};\n-\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, sensorSizes, 4);\n-\n \tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, ×tamp, 1);\n \n \t/* 33.3 msec */\n@@ -1911,6 +1942,15 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n \t\t\t\t\t &exposure, 1);\n \t}\n \n+\tif (metadata.contains(controls::ScalerCrop)) {\n+\t\tRectangle crop = metadata.get(controls::ScalerCrop);\n+\t\tint32_t cropRect[] = {\n+\t\t\tcrop.x, crop.y, static_cast<int32_t>(crop.width),\n+\t\t\tstatic_cast<int32_t>(crop.height),\n+\t\t};\n+\t\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect, 4);\n+\t}\n+\n \t/*\n \t * Return the result metadata pack even is not valid: get() will return\n \t * nullptr.\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 07d3a846f8e1..0874c80f1e66 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -105,6 +105,8 @@ private:\n \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n \tCameraMetadata *requestTemplatePreview();\n \tlibcamera::PixelFormat toPixelFormat(int format) const;\n+\tint processControls(camera3_capture_request_t *camera3Request,\n+\t\t\t Camera3RequestDescriptor *descriptor);\n \tstd::unique_ptr<CameraMetadata> getResultMetadata(\n \t\tCamera3RequestDescriptor *descriptor, int64_t timestamp);\n \ndiff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\nindex 847a2fc4bd7c..6522f1d68a20 100644\n--- a/src/android/camera_worker.h\n+++ b/src/android/camera_worker.h\n@@ -25,6 +25,7 @@ public:\n \tCaptureRequest(libcamera::Camera *camera, uint64_t cookie);\n \n \tconst std::vector<int> &fences() const { return acquireFences_; }\n+\tlibcamera::ControlList &controls() { return request_->controls(); }\n \tconst libcamera::ControlList &metadata() const\n \t{\n \t\treturn request_->metadata();\n", "prefixes": [ "libcamera-devel", "10/12" ] }