{"id":9985,"url":"https://patchwork.libcamera.org/api/patches/9985/?format=json","web_url":"https://patchwork.libcamera.org/patch/9985/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20201006160637.29841-3-jacopo@jmondi.org>","date":"2020-10-06T16:06:37","name":"[libcamera-devel,RFC,2/2] android: camera_device: Queue request to Worker","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"630fc4ae16cb447f3a73d27164e2d0dfc6580b22","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/9985/mbox/","series":[{"id":1357,"url":"https://patchwork.libcamera.org/api/series/1357/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1357","date":"2020-10-06T16:06:35","name":"android: Introduce CameraWorker","version":1,"mbox":"https://patchwork.libcamera.org/series/1357/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9985/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9985/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 A91F5BEEE0\n\tfor ;\n\tTue, 6 Oct 2020 16:02:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 85E9B63C1B;\n\tTue, 6 Oct 2020 18:02:47 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CACC663C13\n\tfor ;\n\tTue, 6 Oct 2020 18:02:44 +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 relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 67FE31BF210;\n\tTue, 6 Oct 2020 16:02:44 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 6 Oct 2020 18:06:37 +0200","Message-Id":"<20201006160637.29841-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201006160637.29841-1-jacopo@jmondi.org>","References":"<20201006160637.29841-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [RFC 2/2] android: camera_device: Queue request\n\tto Worker","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":"Add a CameraWorker class member to the CameraDevice class and\nqueue capture requests to it to delegate fence handling and capture\nrequests queueing to the camera.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 21 ++++++++-------------\n src/android/camera_device.h | 3 +++\n 2 files changed, 11 insertions(+), 13 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 8da70e817b46..edac9f28ab67 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -194,8 +194,8 @@ CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n */\n \n CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr &camera)\n-\t: id_(id), running_(false), camera_(camera), staticMetadata_(nullptr),\n-\t facing_(CAMERA_FACING_FRONT), orientation_(0)\n+\t: id_(id), worker_(camera), running_(false), camera_(camera),\n+\t staticMetadata_(nullptr), facing_(CAMERA_FACING_FRONT), orientation_(0)\n {\n \tcamera_->requestCompleted.connect(this, &CameraDevice::requestComplete);\n \n@@ -1375,8 +1375,9 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tnew Camera3RequestDescriptor(camera3Request->frame_number,\n \t\t\t\t\t camera3Request->num_output_buffers);\n \n-\tRequest *request =\n-\t\tcamera_->createRequest(reinterpret_cast(descriptor));\n+\tstd::unique_ptr captureRequest =\n+\t\tstd::make_unique(\n+\t\t\tcamera_->createRequest(reinterpret_cast(descriptor)));\n \n \tLOG(HAL, Debug) << \"Queueing Request to libcamera with \"\n \t\t\t<< descriptor->numBuffers << \" HAL streams\";\n@@ -1440,21 +1441,15 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\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 \n-\t\trequest->addBuffer(cameraStream->stream(), buffer);\n+\t\tcaptureRequest->addBuffer(cameraStream->stream(), buffer,\n+\t\t\t\t\t camera3Buffers[i].acquire_fence);\n \t}\n \n-\tint ret = camera_->queueRequest(request);\n-\tif (ret) {\n-\t\tLOG(HAL, Error) << \"Failed to queue request\";\n-\t\tdelete request;\n-\t\tdelete descriptor;\n-\t\treturn ret;\n-\t}\n+\tworker_.queueRequest(std::move(captureRequest));\n \n \treturn 0;\n }\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 777d1a35e801..b4b32f77a29a 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -25,6 +25,7 @@\n #include \"libcamera/internal/message.h\"\n \n #include \"camera_stream.h\"\n+#include \"camera_worker.h\"\n #include \"jpeg/encoder.h\"\n \n class CameraMetadata;\n@@ -108,6 +109,8 @@ private:\n \tunsigned int id_;\n \tcamera3_device_t camera3Device_;\n \n+\tCameraWorker worker_;\n+\n \tbool running_;\n \tstd::shared_ptr camera_;\n \tstd::unique_ptr config_;\n","prefixes":["libcamera-devel","RFC","2/2"]}