[{"id":11576,"web_url":"https://patchwork.libcamera.org/comment/11576/","msgid":"<20200724171100.GR5921@pendragon.ideasonboard.com>","date":"2020-07-24T17:11:00","subject":"Re: [libcamera-devel] [RFC PATCH v2 6/8] android: camera_device:\n\tOnly construct required planes","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Mon, Jul 20, 2020 at 11:48:32PM +0100, Kieran Bingham wrote:\n> The camera3buffer describes the number of filedescriptors given.\n> Don't try to construct more planes than that.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> ---\n> v2:\n>  - cleanly skip planes with no given file descriptor (set to -1)\n>  - Clean up the error handling and reporting if the FileDescriptor\n>    failes to dup.\n> \n>  src/android/camera_device.cpp | 13 ++++++++++++-\n>  1 file changed, 12 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index e5c50084e590..610c54d45eb9 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1033,9 +1033,20 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>  FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer)\n>  {\n>  \tstd::vector<FrameBuffer::Plane> planes;\n> -\tfor (unsigned int i = 0; i < 3; i++) {\n> +\tfor (int i = 0; i < camera3buffer->numFds; i++) {\n\nI'd have said unsigned int, but numFds is signed.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> +\t\t/* Skip unused planes. */\n> +\t\tif (camera3buffer->data[i] == -1)\n> +\t\t\tcontinue;\n> +\n>  \t\tFrameBuffer::Plane plane;\n>  \t\tplane.fd = FileDescriptor(camera3buffer->data[i]);\n> +\t\tif (!plane.fd.isValid()) {\n> +\t\t\tLOG(HAL, Error) << \"Failed to obtain FileDescriptor (\"\n> +\t\t\t\t\t<< camera3buffer->data[i] << \") \"\n> +\t\t\t\t\t<< \" on plane \" << i;\n> +\t\t\tcontinue;\n> +\t\t}\n> +\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","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 AFD77BD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 24 Jul 2020 17:11:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 39DB161236;\n\tFri, 24 Jul 2020 19:11:10 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 656606039B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Jul 2020 19:11:08 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CE9D1538;\n\tFri, 24 Jul 2020 19:11:07 +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=\"dNF/5XuB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1595610668;\n\tbh=sXXivDJvhOZD4GcPJaUI8DMCAHhdUPNSZ85DIzvaLhA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dNF/5XuBfsIdZ3sXfVj6FRRt6nMHHcYYMl7+5VqTKoLrvWYUiLRwfwAoncvbzDnot\n\t9Y3+jwmq2dWwN3qlOYxVTuveHMv6DmvnV1ZpW6W25KVS/+yFyU1j08GzoVyiZsxJdJ\n\tioNp+bKrBMr6KnVoNx9t8ljqhlbXbkH/4t4xZEyo=","Date":"Fri, 24 Jul 2020 20:11:00 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<20200724171100.GR5921@pendragon.ideasonboard.com>","References":"<20200720224232.153717-7-kieran.bingham@ideasonboard.com>\n\t<20200720224832.154442-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200720224832.154442-1-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH v2 6/8] android: camera_device:\n\tOnly construct required planes","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":"libcamera devel <libcamera-devel@lists.libcamera.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>"}}]