[{"id":18680,"web_url":"https://patchwork.libcamera.org/comment/18680/","msgid":"<20210810134618.iev64lx4gepzjucs@uno.localdomain>","date":"2021-08-10T13:46:18","subject":"Re: [libcamera-devel] [PATCH v2 05/11] libcamera: pipeline: vimc:\n\tMigrate to Camera::Private","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Thu, Aug 05, 2021 at 08:58:42PM +0300, Laurent Pinchart wrote:\n> As part of the effort to remove the CameraData class, migrate the\n> pipeline handler-specific camera data from CameraData to the\n> Camera::Private class.\n>\n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Niklas Söderlund \n> ---\n> src/libcamera/pipeline/vimc/vimc.cpp | 19 +++++++++----------\n> 1 file changed, 9 insertions(+), 10 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index d63562b1ee54..866c993d7e50 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -42,11 +42,11 @@ namespace libcamera {\n>\n> LOG_DEFINE_CATEGORY(VIMC)\n>\n> -class VimcCameraData : public CameraData\n> +class VimcCameraData : public Camera::Private\n> {\n> public:\n> \tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n> -\t\t: CameraData(pipe), media_(media)\n> +\t\t: Camera::Private(pipe), media_(media)\n> \t{\n> \t}\n>\n> @@ -97,10 +97,9 @@ public:\n> private:\n> \tint processControls(VimcCameraData *data, Request *request);\n>\n> -\tVimcCameraData *cameraData(const Camera *camera)\n> +\tVimcCameraData *cameraData(Camera *camera)\n> \t{\n> -\t\treturn static_cast(\n> -\t\t\tPipelineHandler::cameraData(camera));\n> +\t\treturn static_cast(camera->_d());\n> \t}\n> };\n>\n> @@ -438,10 +437,10 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n>\n> \t/* Create and register the camera. */\n> \tstd::set streams{ &data->stream_ };\n> +\tconst std::string &id = data->sensor_->id();\n\nSame minor nit, do you need id ?\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> \tstd::shared_ptr camera =\n> -\t\tCamera::create(new Camera::Private(this), data->sensor_->id(),\n> -\t\t\t streams);\n> -\tregisterCamera(std::move(camera), std::move(data));\n> +\t\tCamera::create(data.release(), id, streams);\n> +\tregisterCamera(std::move(camera), nullptr);\n>\n> \treturn true;\n> }\n> @@ -530,8 +529,8 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer)\n> \trequest->metadata().set(controls::SensorTimestamp,\n> \t\t\t\tbuffer->metadata().timestamp);\n>\n> -\tpipe_->completeBuffer(request, buffer);\n> -\tpipe_->completeRequest(request);\n> +\tpipe()->completeBuffer(request, buffer);\n> +\tpipe()->completeRequest(request);\n> }\n>\n> REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc)\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","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 58F62C3240\n\tfor ;\n\tTue, 10 Aug 2021 13:45:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2152F6884D;\n\tTue, 10 Aug 2021 15:45:32 +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 82023687F0\n\tfor ;\n\tTue, 10 Aug 2021 15:45:30 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 193CE1BF209;\n\tTue, 10 Aug 2021 13:45:29 +0000 (UTC)"],"Date":"Tue, 10 Aug 2021 15:46:18 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20210810134618.iev64lx4gepzjucs@uno.localdomain>","References":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>\n\t<20210805175848.24188-6-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210805175848.24188-6-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 05/11] libcamera: pipeline: vimc:\n\tMigrate to Camera::Private","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]