[{"id":18678,"web_url":"https://patchwork.libcamera.org/comment/18678/","msgid":"<20210810133949.iux5qh3ne54xk7bb@uno.localdomain>","date":"2021-08-10T13:39:49","subject":"Re: [libcamera-devel] [PATCH v2 04/11] libcamera: pipeline:\n\tuvcvideo: Migrate 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:41PM +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/uvcvideo/uvcvideo.cpp | 17 ++++++++---------\n> 1 file changed, 8 insertions(+), 9 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> index 63cb1daaae22..bbeeda97a91a 100644\n> --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> @@ -33,11 +33,11 @@ namespace libcamera {\n>\n> LOG_DEFINE_CATEGORY(UVC)\n>\n> -class UVCCameraData : public CameraData\n> +class UVCCameraData : public Camera::Private\n> {\n> public:\n> \tUVCCameraData(PipelineHandler *pipe)\n> -\t\t: CameraData(pipe)\n> +\t\t: Camera::Private(pipe)\n> \t{\n> \t}\n>\n> @@ -87,10 +87,9 @@ private:\n> \t\t\t const ControlValue &value);\n> \tint processControls(UVCCameraData *data, Request *request);\n>\n> -\tUVCCameraData *cameraData(const Camera *camera)\n> +\tUVCCameraData *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> @@ -472,8 +471,8 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n>\n> \tstd::set streams{ &data->stream_ };\n> \tstd::shared_ptr camera =\n> -\t\tCamera::create(new Camera::Private(this), id, streams);\n> -\tregisterCamera(std::move(camera), std::move(data));\n> +\t\tCamera::create(data.release(), id, streams);\n\nRegardless of the decision about the Private derived class lifetime\nmanagement, the patch itself looks good\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> +\tregisterCamera(std::move(camera), nullptr);\n>\n> \t/* Enable hot-unplug notifications. */\n> \thotplugMediaDevice(media);\n> @@ -668,8 +667,8 @@ void UVCCameraData::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(PipelineHandlerUVC)\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 0F638C3240\n\tfor ;\n\tTue, 10 Aug 2021 13:39:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7B5CD6884D;\n\tTue, 10 Aug 2021 15:39:03 +0200 (CEST)","from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 13797687F0\n\tfor ;\n\tTue, 10 Aug 2021 15:39:02 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 917B9FF807;\n\tTue, 10 Aug 2021 13:39:01 +0000 (UTC)"],"Date":"Tue, 10 Aug 2021 15:39:49 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20210810133949.iux5qh3ne54xk7bb@uno.localdomain>","References":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>\n\t<20210805175848.24188-5-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-5-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 04/11] libcamera: pipeline:\n\tuvcvideo: Migrate 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\" "}}]