{"id":9960,"url":"https://patchwork.libcamera.org/api/1.1/patches/9960/?format=json","web_url":"https://patchwork.libcamera.org/patch/9960/","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":"<20201005104649.10812-14-laurent.pinchart@ideasonboard.com>","date":"2020-10-05T10:46:47","name":"[libcamera-devel,13/15] android: camera_device: Use CameraStream buffers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e2d088e35b4bc110495b8f44edbb20f961a06f79","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9960/mbox/","series":[{"id":1349,"url":"https://patchwork.libcamera.org/api/1.1/series/1349/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1349","date":"2020-10-05T10:46:34","name":"CameraStream refactoring","version":1,"mbox":"https://patchwork.libcamera.org/series/1349/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9960/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9960/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 36B75C3B5F\n\tfor ;\n\tMon, 5 Oct 2020 10:47:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 02CB463C1F;\n\tMon, 5 Oct 2020 12:47:44 +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 B9E4163C08\n\tfor ;\n\tMon, 5 Oct 2020 12:47:38 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4D994A31;\n\tMon, 5 Oct 2020 12:47:38 +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=\"phrqZ+Gk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601894858;\n\tbh=UYKI8QlWPGQWBii1RikJ8CsvwuSY1PSlV+0b+XZHnJE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=phrqZ+Gkq6X2jh5T/sHhUTBinVlYgPp5El9SvmZBUQLRVhZgjyBwy8s3UQX/XEStc\n\tkm4uxQXapyMx0MjWZ1mrD4v4RAeZpaQ4OsCa3Al+RZZl1iMnH1kdgdn5+IBiW3Kuxg\n\tZOrmpU8xtUZr0mkeqgPra4Nl30V1qOeA8pgR04Jg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Oct 2020 13:46:47 +0300","Message-Id":"<20201005104649.10812-14-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[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\" "},"content":"From: Jacopo Mondi \n\nNow that CameraStream that require internal buffer allocation\nhave been instrumented with a FrameBuffer pool, use them to create\nintermediate buffers in the CameraDevice.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 50 ++++++++++++++++++++++++++++-------\n 1 file changed, 40 insertions(+), 10 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 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 \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. */\n","prefixes":["libcamera-devel","13/15"]}