Patch Detail
Show a patch.
GET /api/1.1/patches/9564/?format=api
{ "id": 9564, "url": "https://patchwork.libcamera.org/api/1.1/patches/9564/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9564/", "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-8-jacopo@jmondi.org>", "date": "2020-09-09T15:54:56", "name": "[libcamera-devel,7/8] android: camera_device: Use libcamera buffer pool", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a8cd9a5c3afa843a8f2daf3bfecac9a2e5717a51", "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/9564/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/9564/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9564/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 CC781BDB1E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 9 Sep 2020 15:51:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 88C1E62D77;\n\tWed, 9 Sep 2020 17:51:26 +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 3A7DF62D62\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 9 Sep 2020 17:51:25 +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 402381BF213;\n\tWed, 9 Sep 2020 15:51:24 +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:56 +0200", "Message-Id": "<20200909155457.153907-8-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 7/8] android: camera_device: Use libcamera\n\tbuffer pool", "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": "Now that we have reserved and made available to the camera HAL a\npool of libcamera allocated buffers, use them when a CameraStream\ninstance that requires internal allocation is processed.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 47 +++++++++++++++++++++++++----------\n 1 file changed, 34 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a7cb1be03b9a..f94b313581e7 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1422,6 +1422,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n \t\tCameraStream *cameraStream =\n \t\t\tstatic_cast<CameraStream *>(camera3Buffers[i].stream->priv);\n+\t\tconst StreamConfiguration &config = config_->at(cameraStream->index());\n+\t\tStream *stream = config.stream();\n \n \t\t/*\n \t\t * Keep track of which stream the request belongs to and store\n@@ -1430,27 +1432,39 @@ 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/* Software streams are handled after hardware streams complete. */\n-\t\tif (cameraStream->format() == formats::MJPEG)\n+\t\t/* Mapped streams don't need to be added to the Request. */\n+\t\tif (cameraStream->type() == CameraStream::Type::Mapped)\n \t\t\tcontinue;\n \n-\t\t/*\n-\t\t * Create a libcamera buffer using the dmabuf descriptors of\n-\t\t * the camera3Buffer for each stream. The FrameBuffer is\n-\t\t * directly associated with the Camera3RequestDescriptor for\n-\t\t * lifetime management only.\n-\t\t */\n-\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n+\t\tFrameBuffer *buffer;\n+\t\tif (cameraStream->type() == CameraStream::Type::Direct) {\n+\t\t\t/*\n+\t\t\t * Create a libcamera buffer using the dmabuf\n+\t\t\t * descriptors of the camera3Buffer for each stream and\n+\t\t\t * associate it with the Camera3RequestDescriptor for\n+\t\t\t * lifetime management only.\n+\t\t\t */\n+\t\t\tbuffer = createFrameBuffer(*camera3Buffers[i].buffer);\n+\t\t\tdescriptor->frameBuffers.emplace_back(buffer);\n+\n+\t\t} else {\n+\t\t\t/*\n+\t\t\t * Get the frame buffer from the CameraStream internal\n+\t\t\t * buffer pool. The lifetime management of internal\n+\t\t\t * buffers is connected to the one of the\n+\t\t\t * FrameBufferAllocator instance.\n+\t\t\t *\n+\t\t\t * The retrieved buffer has to be returned to the\n+\t\t\t * allocator once it has been processed.\n+\t\t\t */\n+\t\t\tbuffer = allocator_.getBuffer(stream);\n+\t\t}\n \t\tif (!buffer) {\n \t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n \t\t\tdelete request;\n \t\t\tdelete descriptor;\n \t\t\treturn -ENOMEM;\n \t\t}\n-\t\tdescriptor->frameBuffers.emplace_back(buffer);\n-\n-\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index());\n-\t\tStream *stream = streamConfiguration->stream();\n \n \t\trequest->addBuffer(stream, buffer);\n \t}\n@@ -1561,6 +1575,13 @@ void CameraDevice::requestComplete(Request *request)\n \t\tconst uint32_t jpeg_orientation = 0;\n \t\tresultMetadata->addEntry(ANDROID_JPEG_ORIENTATION,\n \t\t\t\t\t &jpeg_orientation, 1);\n+\n+\t\t/*\n+\t\t * Return the FrameBuffer to the CameraStream now that we're\n+\t\t * done processing it.\n+\t\t */\n+\t\tif (cameraStream->type() == CameraStream::Type::Internal)\n+\t\t\tallocator_.returnBuffer(stream, buffer);\n \t}\n \n \t/* Prepare to call back the Android camera stack. */\n", "prefixes": [ "libcamera-devel", "7/8" ] }