[{"id":12924,"web_url":"https://patchwork.libcamera.org/comment/12924/","msgid":"<20201002005233.GP3722@pendragon.ideasonboard.com>","date":"2020-10-02T00:52:33","subject":"Re: [libcamera-devel] [PATCH v4 8/9] android: camera_device: Use\n\tlibcamera buffer pool","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 Wed, Sep 30, 2020 at 03:27:06PM +0200, Jacopo Mondi wrote:\n> Now that we have reserved and made available to the camera HAL a\n> pool of libcamera allocated buffers, use them when a CameraStream\n> instance that requires internal allocation is processed.\n> \n> Reviewed-by: Niklas Söderlund \n> Reviewed-by: Hirokazu Honda \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 57 +++++++++++++++++++++++++++--------\n> 1 file changed, 44 insertions(+), 13 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 2ebc3fcc336e..dc19faf8edd7 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1479,6 +1479,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> \t\tCameraStream *cameraStream =\n> \t\t\tstatic_cast(camera3Buffers[i].stream->priv);\n> +\t\tconst StreamConfiguration &config = config_->at(cameraStream->index());\n> +\t\tStream *stream = config.stream();\n> \n> \t\t/*\n> \t\t * Keep track of which stream the request belongs to and store\n> @@ -1487,27 +1489,49 @@ 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->format() == formats::MJPEG)\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. The lifetime management of internal\n> +\t\t\t * buffers is connected to the one of the\n> +\t\t\t * FrameBufferAllocator instance.\n> +\t\t\t *\n> +\t\t\t * The retrieved buffer has to be returned to the\n> +\t\t\t * allocator once it has been processed.\n> +\t\t\t */\n> +\t\t\tbuffer = getBuffer(stream);\n> +\t\t\tbreak;\n> +\t\t}\n\nI'd add a blank 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\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index());\n> -\t\tStream *stream = streamConfiguration->stream();\n> \n> \t\trequest->addBuffer(stream, buffer);\n> \t}\n> @@ -1634,6 +1658,13 @@ void CameraDevice::requestComplete(Request *request)\n> \t\tconst uint32_t jpeg_orientation = 0;\n> \t\tresultMetadata->addEntry(ANDROID_JPEG_ORIENTATION,\n> \t\t\t\t\t &jpeg_orientation, 1);\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\treturnBuffer(stream, 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 C6A65C3B5B\n\tfor ;\n\tFri, 2 Oct 2020 00:53:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 64A4560BCD;\n\tFri, 2 Oct 2020 02:53:12 +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 BB47260BCD\n\tfor ;\n\tFri, 2 Oct 2020 02:53:11 +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 36007255;\n\tFri, 2 Oct 2020 02:53:11 +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=\"Jsc8Jhpz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601599991;\n\tbh=PnsvV38sTmnsme2z1Cl4vmG1g83My6ehpdHXiHCoPhE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Jsc8JhpzKJZe+Dota1AvGVLrh4P+ET6LiTw0YmSdnto1wPlYihGoffY6sS2smHPTm\n\t4OvrVLkiMbvXATVZkgENFwav+pkzn2icqeZyi7DG2ZLDyJQfPhEEcVZIwWtyPbgrjs\n\tcZQILTpBJ7bTsdLIKE7s3gSmWzIJgA7W321ITe0Q=","Date":"Fri, 2 Oct 2020 03:52:33 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20201002005233.GP3722@pendragon.ideasonboard.com>","References":"<20200930132707.19367-1-jacopo@jmondi.org>\n\t<20200930132707.19367-9-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200930132707.19367-9-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v4 8/9] android: camera_device: Use\n\tlibcamera buffer pool","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","Cc":"hanlinchen@chromium.org, libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]