[{"id":19487,"web_url":"https://patchwork.libcamera.org/comment/19487/","msgid":"<1f0b54a9-66dc-0625-a45f-01c8077effeb@ideasonboard.com>","date":"2021-09-06T23:57:49","subject":"Re: [libcamera-devel] [PATCH v3 18/30] android: camera_device:\n\tDon't assume all planes use the same fd","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 06/09/2021 23:56, Laurent Pinchart wrote:\n> Now that libcamera correctly supports frame buffers with different\n> dmabuf for each plane, remove the assumption that a single dmabuf is\n> used.\n> \n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Jean-Michel Hautbois \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/android/camera_device.cpp | 25 ++++++-------------------\n> 1 file changed, 6 insertions(+), 19 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 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 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>","headers":{"Return-Path":"","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 39CBBBE175\n\tfor ;\n\tMon, 6 Sep 2021 23:57:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A36906916A;\n\tTue, 7 Sep 2021 01:57:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 031B160253\n\tfor ;\n\tTue, 7 Sep 2021 01:57:52 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 66155891;\n\tTue, 7 Sep 2021 01:57:52 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"k4XCCs00\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630972672;\n\tbh=h5P8ZAJeTC7VuF9Jwf5L0UP0aws3998e3Vyb3S3tUU0=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=k4XCCs00fHakv53PTVePb/VTwlw2PWcrmoRj0kSvBXcDB8TLe9i/1K0StX5WJCfHG\n\tj80N+K0wCrkRKsfyVkbOAKVGnPDL4TmkyqUUdYKEmy6ELFzWqXfxYZoX7OZAKdHRpE\n\ty3Fx0pkNbbPoa8+YwdGPFrTPGkxKF7j8PrgLiOmc=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210906225420.13275-1-laurent.pinchart@ideasonboard.com>\n\t<20210906225636.14683-18-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"<1f0b54a9-66dc-0625-a45f-01c8077effeb@ideasonboard.com>","Date":"Tue, 7 Sep 2021 00:57:49 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210906225636.14683-18-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v3 18/30] android: camera_device:\n\tDon't assume all planes use the same fd","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]