{"id":10003,"url":"https://patchwork.libcamera.org/api/1.1/patches/10003/?format=json","web_url":"https://patchwork.libcamera.org/patch/10003/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20201007101745.15104-12-jacopo@jmondi.org>","date":"2020-10-07T10:17:43","name":"[libcamera-devel,v3,11/13] android: camera_device: Use CameraStream buffers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4009871eabcc84f33fc1ce29d7c98435e3d10cd1","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10003/mbox/","series":[{"id":1361,"url":"https://patchwork.libcamera.org/api/1.1/series/1361/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1361","date":"2020-10-07T10:17:32","name":"android: CameraStream rework","version":3,"mbox":"https://patchwork.libcamera.org/series/1361/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10003/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10003/checks/","tags":{},"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 E2DB8BEEDF\n\tfor ;\n\tWed, 7 Oct 2020 10:14:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BCA0860553;\n\tWed, 7 Oct 2020 12:14:07 +0200 (CEST)","from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 067936039B\n\tfor ;\n\tWed, 7 Oct 2020 12:14:05 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id A397960014;\n\tWed, 7 Oct 2020 10:14:03 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 7 Oct 2020 12:17:43 +0200","Message-Id":"<20201007101745.15104-12-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201007101745.15104-1-jacopo@jmondi.org>","References":"<20201007101745.15104-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 11/13] 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\" "},"content":"Now that CameraStream that require internal memory allocation\nhave been instrumented with a FrameBuffer pool, use them to create\nintermediate buffers in the CameraDevice.\n\nReviewed-by: Umang Jain \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 51 ++++++++++++++++++++++++++++-------\n 1 file changed, 41 insertions(+), 10 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex ecdc0922e90b..257ffdf233c2 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1387,24 +1387,48 @@ 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->camera3Stream().format == 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 = nullptr;\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+\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@@ -1476,6 +1500,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. */\n","prefixes":["libcamera-devel","v3","11/13"]}