Patch Detail
Show a patch.
GET /api/1.1/patches/9565/?format=api
{ "id": 9565, "url": "https://patchwork.libcamera.org/api/1.1/patches/9565/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9565/", "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": "<20200909155457.153907-9-jacopo@jmondi.org>", "date": "2020-09-09T15:54:57", "name": "[libcamera-devel,8/8] android: camera_device: Add stream mapping log", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "99cffe76693c654ef6a8e090b176f786ed9eb363", "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/9565/mbox/", "series": [ { "id": 1282, "url": "https://patchwork.libcamera.org/api/1.1/series/1282/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1282", "date": "2020-09-09T15:54:49", "name": "android: camera_device: Allocate internal buffers", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1282/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9565/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9565/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 3B8A5BDB1D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 9 Sep 2020 15:51:28 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1036862D6A;\n\tWed, 9 Sep 2020 17:51:28 +0200 (CEST)", "from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4544162C30\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 9 Sep 2020 17:51:26 +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 relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 5C3E01BF208;\n\tWed, 9 Sep 2020 15:51:25 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 9 Sep 2020 17:54:57 +0200", "Message-Id": "<20200909155457.153907-9-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200909155457.153907-1-jacopo@jmondi.org>", "References": "<20200909155457.153907-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 8/8] android: camera_device: Add stream\n\tmapping 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>", "Cc": "hanlinchen@chromium.org", "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": "To ease following how Android stream gets mapped onto libcamera ones\nadd a (quite verbose) printout before queueing a request to libcamera.\n\nThe output looks like:\n 0 - (320x240)[0x00000022] -> (320x240)[NV12] (external)\n 1 - (640x480)[0x00000021] -> (640x480)[NV12] (internal)\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 f94b313581e7..811f0a66cf2f 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1419,9 +1419,12 @@ 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 << \" 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+\t\t\tstatic_cast<CameraStream *>(camera3Stream->priv);\n \t\tconst StreamConfiguration &config = config_->at(cameraStream->index());\n \t\tStream *stream = config.stream();\n \n@@ -1432,9 +1435,18 @@ 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\t/* Mapped streams don't need to be added to the Request. */\n-\t\tif (cameraStream->type() == CameraStream::Type::Mapped)\n+\t\tstd::stringstream ss;\n+\t\tss << i << \" - (\";\n+\t\tss << camera3Stream->width << \"x\" << camera3Stream->height << \")\"\n+\t\t << \"[\" << utils::hex(camera3Stream->format) << \"] -> \"\n+\t\t << \"(\" << config.size.toString() << \")[\"\n+\t\t << config.pixelFormat.toString() << \"]\";\n+\n+\t\t/* Mapped streams don't need buffers added to the Request. */\n+\t\tif (cameraStream->type() == CameraStream::Type::Mapped) {\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (mapped)\";\n \t\t\tcontinue;\n+\t\t}\n \n \t\tFrameBuffer *buffer;\n \t\tif (cameraStream->type() == CameraStream::Type::Direct) {\n@@ -1446,6 +1458,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\tss << \" (external)\";\n \n \t\t} else {\n \t\t\t/*\n@@ -1458,7 +1471,11 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * allocator once it has been processed.\n \t\t\t */\n \t\t\tbuffer = allocator_.getBuffer(stream);\n+\t\t\tss << \" (internal)\";\n \t\t}\n+\n+\t\tLOG(HAL, Debug) << ss.str();\n+\n \t\tif (!buffer) {\n \t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n \t\t\tdelete request;\n", "prefixes": [ "libcamera-devel", "8/8" ] }