Patch Detail
Show a patch.
GET /api/1.1/patches/13685/?format=api
{ "id": 13685, "url": "https://patchwork.libcamera.org/api/1.1/patches/13685/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13685/", "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": "<20210906225636.14683-18-laurent.pinchart@ideasonboard.com>", "date": "2021-09-06T22:56:24", "name": "[libcamera-devel,v3,18/30] android: camera_device: Don't assume all planes use the same fd", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5996028a6012c839f6087aa5e0ffa2834c2474ae", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13685/mbox/", "series": [ { "id": 2482, "url": "https://patchwork.libcamera.org/api/1.1/series/2482/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2482", "date": "2021-09-06T22:54:20", "name": "libcamera: Handle fallout of FrameBuffer offset support", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2482/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13685/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13685/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 9C873BE175\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 6 Sep 2021 22:57:45 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5AD1F69168;\n\tTue, 7 Sep 2021 00:57:45 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2BBA869184\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 7 Sep 2021 00:57:06 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B8623891;\n\tTue, 7 Sep 2021 00:57:05 +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=\"WvhxN2YR\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630969025;\n\tbh=72iPAvQlOWqo1OLDSL3+qXDCX4aKEck7EYVkLGusbzU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=WvhxN2YRTfmd15zqqEjLFU03stx3+Iq8fOwmIwiBz5BuDqRfNUnk5fVN3JeQr6tyY\n\tsrgill7pG3gsiDi/YE4LWsQXk/Lxcy7D3FXcdnJ9pCzm44VPLJSu5gp/V7yau3EvXz\n\t5kI7YjczAgzEyCpst6NHuOPUJTqWzTaoAgW4oB3U=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 7 Sep 2021 01:56:24 +0300", "Message-Id": "<20210906225636.14683-18-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20210906225420.13275-1-laurent.pinchart@ideasonboard.com>", "References": "<20210906225420.13275-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 18/30] android: camera_device: Don't\n\tassume all planes use the same fd", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Now that libcamera correctly supports frame buffers with different\ndmabuf for each plane, remove the assumption that a single dmabuf is\nused.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\n src/android/camera_device.cpp | 25 ++++++-------------------\n 1 file changed, 6 insertions(+), 19 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 8ca76719a50f..c64064106ccc 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -749,25 +749,6 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer\n \t\t\t\t\t libcamera::PixelFormat pixelFormat,\n \t\t\t\t\t const libcamera::Size &size)\n {\n-\tFileDescriptor fd;\n-\t/*\n-\t * This assumes all the planes are in the same dmabuf.\n-\t *\n-\t * \\todo Verify that this assumption holds, fstat() can be used to check\n-\t * if two fds refer to the same dmabuf.\n-\t */\n-\tfor (int i = 0; i < camera3buffer->numFds; i++) {\n-\t\tif (camera3buffer->data[i] != -1) {\n-\t\t\tfd = FileDescriptor(camera3buffer->data[i]);\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n-\tif (!fd.isValid()) {\n-\t\tLOG(HAL, Fatal) << \"No valid fd\";\n-\t\treturn nullptr;\n-\t}\n-\n \tCameraBuffer buf(camera3buffer, pixelFormat, size, PROT_READ);\n \tif (!buf.isValid()) {\n \t\tLOG(HAL, Fatal) << \"Failed to create CameraBuffer\";\n@@ -776,6 +757,12 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer\n \n \tstd::vector<FrameBuffer::Plane> planes(buf.numPlanes());\n \tfor (size_t i = 0; i < buf.numPlanes(); ++i) {\n+\t\tFileDescriptor fd{ camera3buffer->data[i] };\n+\t\tif (!fd.isValid()) {\n+\t\t\tLOG(HAL, Fatal) << \"No valid fd\";\n+\t\t\treturn nullptr;\n+\t\t}\n+\n \t\tplanes[i].fd = fd;\n \t\tplanes[i].offset = buf.offset(i);\n \t\tplanes[i].length = buf.size(i);\n", "prefixes": [ "libcamera-devel", "v3", "18/30" ] }