[{"id":13149,"web_url":"https://patchwork.libcamera.org/comment/13149/","msgid":"<20201009174020.GB25040@pendragon.ideasonboard.com>","date":"2020-10-09T17:40:20","subject":"Re: [libcamera-devel] [PATCH 2/2] android: camera_device: Queue\n\trequest to Worker","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 Fri, Oct 09, 2020 at 03:39:56PM +0200, Jacopo Mondi wrote:\n> Add a CameraWorker class member to the CameraDevice class and\n> queue capture requests to it to delegate fence handling and capture\n> requests queueing to the camera.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 19 +++++++++----------\n> src/android/camera_device.h | 3 +++\n> 2 files changed, 12 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 0a94c1ae17ac..0e42e2e194d8 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> @@ -519,6 +519,7 @@ void CameraDevice::close()\n> {\n> \tstreams_.clear();\n> \n> +\tworker_.stop();\n> \tcamera_->stop();\n> \tcamera_->release();\n> \n> @@ -1356,6 +1357,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\t\treturn ret;\n> \t\t}\n> \n> +\t\tworker_.start();\n> +\n> \t\trunning_ = true;\n> \t}\n> \n> @@ -1377,6 +1380,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \n> \tRequest *request =\n> \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n> +\tstd::unique_ptr captureRequest = std::make_unique(request);\n\nLine break ?\n\nReviewed-by: Laurent Pinchart \n\n> \n> \tLOG(HAL, Debug) << \"Queueing Request to libcamera with \"\n> \t\t\t<< descriptor->numBuffers << \" HAL streams\";\n> @@ -1445,16 +1449,11 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\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> }\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 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_;","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 C7CFABEEE0\n\tfor ;\n\tFri, 9 Oct 2020 17:41:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 663B960359;\n\tFri, 9 Oct 2020 19:41:05 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D703360358\n\tfor ;\n\tFri, 9 Oct 2020 19:41:03 +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 48B59539;\n\tFri, 9 Oct 2020 19:41:03 +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=\"a7XjucF2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602265263;\n\tbh=0+JZsyic3qMXljj3C9WX5so/i3F5cjACPo3xk1/HmjA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=a7XjucF2CtnhAE4Jkw9SNxx+v/Xtx0MWXMOt4CuUsOMK1LlzhbjGAJbLzKyaBHEYc\n\tAdWH1OCLFluaxSSKKB4I3hykpn/kYdPaAjxG0gm92EsX1X4yptOHdaTOOIFgDB5oXp\n\taOVL80P08Qa40ZNS6w7SLRWidNu7+YfvleSe9lgI=","Date":"Fri, 9 Oct 2020 20:40:20 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20201009174020.GB25040@pendragon.ideasonboard.com>","References":"<20201009133956.77396-1-jacopo@jmondi.org>\n\t<20201009133956.77396-3-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201009133956.77396-3-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 2/2] android: camera_device: Queue\n\trequest to 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]