Patch Detail
Show a patch.
GET /api/1.1/patches/8559/?format=api
{ "id": 8559, "url": "https://patchwork.libcamera.org/api/1.1/patches/8559/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8559/", "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": "<20200702213654.2129054-5-kieran.bingham@ideasonboard.com>", "date": "2020-07-02T21:36:49", "name": "[libcamera-devel,v2,4/9] android: camera_device: Simplify FrameBuffer construction from a buffer_handle_t", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e6343172343ba575fbdb88bb2718304ef823512d", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/1.1/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8559/mbox/", "series": [ { "id": 1073, "url": "https://patchwork.libcamera.org/api/1.1/series/1073/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1073", "date": "2020-07-02T21:36:45", "name": "android: Multi-stream support", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1073/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8559/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8559/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 D023ABE905\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 2 Jul 2020 21:37:07 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9AB8F60C64;\n\tThu, 2 Jul 2020 23:37:07 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 40307603B4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 2 Jul 2020 23:37:04 +0200 (CEST)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CE16FA2D;\n\tThu, 2 Jul 2020 23:37:03 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"MC+mCxVZ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593725824;\n\tbh=5uAYqUB/sM2KTBrinUCWupfRoKYYXBMp40afSc/pyTQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=MC+mCxVZN4g4kHI/Oq8syp03iaHXYPzjTB1szcbQeKoGqJQc2gfKnyW+jmcceCJVB\n\tGfyRcDzWViub1B7INqvF/osTwosk5Xgx2yrlhmg8kz4kJVkxBTcRMRv8nab6+oF5XN\n\tlq1/327XwuiR7fuYXubIoaSPpEPIENxuONrk05Bk=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Thu, 2 Jul 2020 22:36:49 +0100", "Message-Id": "<20200702213654.2129054-5-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>", "References": "<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 4/9] android: camera_device: Simplify\n\tFrameBuffer construction from a buffer_handle_t", "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": "Move the code which constructs a FrameBuffer from the Android buffer handle\nto it's own function to simplify the code flow and readability.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/android/camera_device.cpp | 35 +++++++++++++++++++----------------\n 1 file changed, 19 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 03dcdd520794..78ecfd7c2ee2 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1011,6 +1011,24 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \treturn 0;\n }\n \n+static FrameBuffer *newFrameBuffer(const buffer_handle_t camera3buffer)\n+{\n+\tstd::vector<FrameBuffer::Plane> planes;\n+\tfor (unsigned int i = 0; i < 3; i++) {\n+\t\tFrameBuffer::Plane plane;\n+\t\tplane.fd = FileDescriptor(camera3buffer->data[i]);\n+\t\t/*\n+\t\t * Setting length to zero here is OK as the length is only used\n+\t\t * to map the memory of the plane. Libcamera do not need to poke\n+\t\t * at the memory content queued by the HAL.\n+\t\t */\n+\t\tplane.length = 0;\n+\t\tplanes.push_back(std::move(plane));\n+\t}\n+\n+\treturn new FrameBuffer(std::move(planes));\n+}\n+\n int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n {\n \tStreamConfiguration *streamConfiguration = &config_->at(0);\n@@ -1064,22 +1082,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t * Create a libcamera buffer using the dmabuf descriptors of the first\n \t * and (currently) only supported request buffer.\n \t */\n-\tconst buffer_handle_t camera3Handle = *camera3Buffers[0].buffer;\n-\n-\tstd::vector<FrameBuffer::Plane> planes;\n-\tfor (int i = 0; i < 3; i++) {\n-\t\tFrameBuffer::Plane plane;\n-\t\tplane.fd = FileDescriptor(camera3Handle->data[i]);\n-\t\t/*\n-\t\t * Setting length to zero here is OK as the length is only used\n-\t\t * to map the memory of the plane. Libcamera do not need to poke\n-\t\t * at the memory content queued by the HAL.\n-\t\t */\n-\t\tplane.length = 0;\n-\t\tplanes.push_back(std::move(plane));\n-\t}\n-\n-\tFrameBuffer *buffer = new FrameBuffer(std::move(planes));\n+\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n \tif (!buffer) {\n \t\tLOG(HAL, Error) << \"Failed to create buffer\";\n \t\tdelete descriptor;\n", "prefixes": [ "libcamera-devel", "v2", "4/9" ] }