Patch Detail
Show a patch.
GET /api/1.1/patches/10004/?format=api
{ "id": 10004, "url": "https://patchwork.libcamera.org/api/1.1/patches/10004/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10004/", "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": "<20201007101745.15104-13-jacopo@jmondi.org>", "date": "2020-10-07T10:17:44", "name": "[libcamera-devel,v3,12/13] android: camera_device: Add stream mapping log", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c7327704ff0cf76fca7722ad57e7304937d3ad2c", "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/10004/mbox/", "series": [ { "id": 1361, "url": "https://patchwork.libcamera.org/api/1.1/series/1361/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1361", "date": "2020-10-07T10:17:32", "name": "android: CameraStream rework", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1361/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10004/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10004/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 39DA9BEEE1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Oct 2020 10:14:08 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 126C960423;\n\tWed, 7 Oct 2020 12:14:08 +0200 (CEST)", "from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E70F860396\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Oct 2020 12:14:06 +0200 (CEST)", "from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 549A16001A;\n\tWed, 7 Oct 2020 10:14:04 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 7 Oct 2020 12:17:44 +0200", "Message-Id": "<20201007101745.15104-13-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20201007101745.15104-1-jacopo@jmondi.org>", "References": "<20201007101745.15104-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 12/13] android: camera_device: Add\n\tstream mapping log", "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=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "To ease following how Android streams get mapped to libcamera ones\nadd a (quite verbose) printout before queueing a request to libcamera.\n\nThe output looks like:\n 0 - (320x240)[0x00000022] -> (320x240)[NV12] (direct)\n 1 - (640x480)[0x00000021] -> (640x480)[NV12] (internal)\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 13 +++++++++++++\n 1 file changed, 13 insertions(+)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 257ffdf233c2..c6b6fe4b3ae3 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1376,7 +1376,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \tRequest *request =\n \t\tcamera_->createRequest(reinterpret_cast<uint64_t>(descriptor));\n \n+\tLOG(HAL, Debug) << \"Queueing Request to libcamera with \"\n+\t\t\t<< descriptor->numBuffers << \" HAL streams\";\n \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n+\t\tcamera3_stream *camera3Stream = camera3Buffers[i].stream;\n \t\tCameraStream *cameraStream =\n \t\t\tstatic_cast<CameraStream *>(camera3Buffers[i].stream->priv);\n \n@@ -1387,6 +1390,13 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tdescriptor->buffers[i].stream = camera3Buffers[i].stream;\n \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n \n+\t\tstd::stringstream ss;\n+\t\tss << i << \" - (\" << camera3Stream->width << \"x\"\n+\t\t << camera3Stream->height << \")\"\n+\t\t << \"[\" << utils::hex(camera3Stream->format) << \"] -> \"\n+\t\t << \"(\" << cameraStream->configuration().size.toString() << \")[\"\n+\t\t << cameraStream->configuration().pixelFormat.toString() << \"]\";\n+\n \t\t/*\n \t\t * Inspect the camera stream type, create buffers opportunely\n \t\t * and add them to the Request if required.\n@@ -1398,6 +1408,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * Mapped streams don't need buffers added to the\n \t\t\t * Request.\n \t\t\t */\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (mapped)\";\n \t\t\tcontinue;\n \n \t\tcase CameraStream::Type::Direct:\n@@ -1409,6 +1420,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t */\n \t\t\tbuffer = createFrameBuffer(*camera3Buffers[i].buffer);\n \t\t\tdescriptor->frameBuffers.emplace_back(buffer);\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (direct)\";\n \t\t\tbreak;\n \n \t\tcase CameraStream::Type::Internal:\n@@ -1420,6 +1432,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * once it has been processed.\n \t\t\t */\n \t\t\tbuffer = cameraStream->getBuffer();\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (internal)\";\n \t\t\tbreak;\n \t\t}\n \n", "prefixes": [ "libcamera-devel", "v3", "12/13" ] }