[{"id":12982,"web_url":"https://patchwork.libcamera.org/comment/12982/","msgid":"<20201005124319.GO3931@pendragon.ideasonboard.com>","date":"2020-10-05T12:43:19","subject":"Re: [libcamera-devel] [PATCH 13/15] android: camera_device: Use\n\tCameraStream buffers","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Mon, Oct 05, 2020 at 01:46:47PM +0300, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Now that CameraStream that require internal buffer allocation\n> have been instrumented with a FrameBuffer pool, use them to create\n> intermediate buffers in the CameraDevice.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 50 ++++++++++++++++++++++++++++-------\n> 1 file changed, 40 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 62307726aea9..186c9f724c3e 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1390,24 +1390,47 @@ 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->outputFormat() == HAL_PIXEL_FORMAT_BLOB)\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 * Inspect the camera stream type, create buffers opportunely\n> +\t\t * and add them to the Request if required.\n> \t\t */\n> -\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> +\t\tFrameBuffer *buffer;\n> +\t\tswitch (cameraStream->type()) {\n> +\t\tcase CameraStream::Type::Mapped:\n> +\t\t\t/*\n> +\t\t\t * Mapped streams don't need buffers added to the\n> +\t\t\t * Request.\n> +\t\t\t */\n> +\t\t\tcontinue;\n> +\n> +\t\tcase 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> +\t\t\tbreak;\n> +\n> +\t\tcase CameraStream::Type::Internal:\n> +\t\t\t/*\n> +\t\t\t * Get the frame buffer from the CameraStream internal\n> +\t\t\t * buffer pool.\n> +\t\t\t *\n> +\t\t\t * The buffer has to be returned to the CameraStream\n> +\t\t\t * once it has been processed.\n> +\t\t\t */\n> +\t\t\tbuffer = cameraStream->getBuffer();\n> +\t\t\tbreak;\n> +\t\t}\n\nBlank line here.\n\nReviewed-by: Laurent Pinchart \n\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\trequest->addBuffer(cameraStream->stream(), buffer);\n> \t}\n> @@ -1479,6 +1502,13 @@ void CameraDevice::requestComplete(Request *request)\n> \t\t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n> \t\t\tcontinue;\n> \t\t}\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\tcameraStream->putBuffer(buffer);\n> \t}\n> \n> \t/* Prepare to call back the Android camera stack. */","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 4A63DC3B5C\n\tfor ;\n\tMon, 5 Oct 2020 12:44:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C74EB63C13;\n\tMon, 5 Oct 2020 14:43:59 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8DF1D63BD5\n\tfor ;\n\tMon, 5 Oct 2020 14:43:58 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 053AB3B\n\tfor ;\n\tMon, 5 Oct 2020 14:43:57 +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=\"Mrk4nVgl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601901838;\n\tbh=OAa1OPnxg22hegD0prTckS3dxXu0Y1ztyhWBmLVPuSE=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=Mrk4nVgl9+t2F2OIho4iLGM1rz23alQobKejnLieBC6wKljd1VLp21s5ouzdgZSsT\n\t1lb9dRAeI7jDv7tk7dApsEjsnE+2BIJ1sWTOb1EdVQMx/42B5sIl5KmFRqjtyCDnus\n\tuazFqMmQ2WpQ1MaR7j0D+vguZqEUAeEWeLShZ1VA=","Date":"Mon, 5 Oct 2020 15:43:19 +0300","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20201005124319.GO3931@pendragon.ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-14-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005104649.10812-14-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 13/15] android: camera_device: Use\n\tCameraStream buffers","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]