{"id":9691,"url":"https://patchwork.libcamera.org/api/1.1/patches/9691/?format=json","web_url":"https://patchwork.libcamera.org/patch/9691/","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":"<20200922094738.5327-8-jacopo@jmondi.org>","date":"2020-09-22T09:47:37","name":"[libcamera-devel,v3,7/8] android: camera_device: Use libcamera buffer pool","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ea0c2caf90fc226b1594b116f739dbc845b77367","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/9691/mbox/","series":[{"id":1306,"url":"https://patchwork.libcamera.org/api/1.1/series/1306/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1306","date":"2020-09-22T09:47:30","name":"android: camera_device: Add support for internal buffers","version":3,"mbox":"https://patchwork.libcamera.org/series/1306/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9691/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9691/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 D425BBF01C\n\tfor ;\n\tTue, 22 Sep 2020 09:44:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 74C8E62FDD;\n\tTue, 22 Sep 2020 11:44:42 +0200 (CEST)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 80B8160364\n\tfor ;\n\tTue, 22 Sep 2020 11:44:41 +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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id BCC58E0010;\n\tTue, 22 Sep 2020 09:44:33 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 22 Sep 2020 11:47:37 +0200","Message-Id":"<20200922094738.5327-8-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200922094738.5327-1-jacopo@jmondi.org>","References":"<20200922094738.5327-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 7/8] 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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that we have reserved and made available to the camera HAL a\npool of libcamera allocated buffers, use them when a CameraStream\ninstance that requires internal allocation is processed.\n\nReviewed-by: Niklas Söderlund \nReviewed-by: Hirokazu Honda \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 57 +++++++++++++++++++++++++++--------\n 1 file changed, 44 insertions(+), 13 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 6ed56ff57dab..1b35c72a3de6 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1477,6 +1477,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@@ -1485,27 +1487,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 \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@@ -1632,6 +1656,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. */\n","prefixes":["libcamera-devel","v3","7/8"]}