[{"id":18307,"web_url":"https://patchwork.libcamera.org/comment/18307/","msgid":"","date":"2021-07-24T07:25:47","subject":"Re: [libcamera-devel] [RFC PATCH 11/17] libcamera: pipeline:\n\tuvcvideo: Migrate to Camera::Private","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2021-07-23 07:00:30 +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\nReviewed-by: Niklas Söderlund \n\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> +\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 8D0C3C0109\n\tfor ;\n\tSat, 24 Jul 2021 07:25:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 44B96687A9;\n\tSat, 24 Jul 2021 09:25:50 +0200 (CEST)","from mail-lf1-x133.google.com (mail-lf1-x133.google.com\n\t[IPv6:2a00:1450:4864:20::133])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C544268540\n\tfor ;\n\tSat, 24 Jul 2021 09:25:48 +0200 (CEST)","by mail-lf1-x133.google.com with SMTP id h2so5885663lfu.4\n\tfor ;\n\tSat, 24 Jul 2021 00:25:48 -0700 (PDT)","from localhost (h-46-59-88-219.A463.priv.bahnhof.se.\n\t[46.59.88.219]) by smtp.gmail.com with ESMTPSA id\n\tc10sm3616514ljn.11.2021.07.24.00.25.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 24 Jul 2021 00:25:47 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"AQFOVC74\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=WbpcPwdiJYE/1NCr4+JLsGCmRp4cOrb4nYBAt4uEqm0=;\n\tb=AQFOVC74h9voVZ68lJZieSNfk2P+h6Izje8piYtxy3Kzbi+u7WjOgnYDiSLCAeQu4n\n\tpJ+xcAfooGT1SFCW2mmENXcqdZQ1ZM0mwZL9dohnWJeD43FOl1qWc5E46F4HVdQfV12L\n\tC/Lyt3oXMVVfRE/I4aSs01W6x0mUH78TG2K/hFU/I1yVujCVOekHbKRmaxLRRy7iSk3m\n\t5cmaDS64R0dtAU02EqAVGGV/JFnta+4qdB93ZgMi+v1G5qYlS2C8u8JJelb5M68UFvxH\n\taW/aaMT/fmH7cB35h9rvr+1YIiIFp49Xxd+CWUrJmzumK7fzSeQSk8kwha2BWlzWHeLE\n\t5nPA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=WbpcPwdiJYE/1NCr4+JLsGCmRp4cOrb4nYBAt4uEqm0=;\n\tb=SzqfEXUaihe9JxWlEwuVuUOeNQVlFqZY0QgRqOP0x+SccDxi+kuOGGHj80zymzBhgP\n\tJF5KRtPnyZNuFLuqsmUftKCc/WLpzmniEAXQ6FqjJUcvwVW6q40/1zRqyzT31heafax/\n\tEKEtSxyU7l2iHVdDuhDREfvr52o4bRE/Yhm96Ssgf0KDXJJ0MEO1EUSzF2MT6hv9nOWH\n\tjErP0SNQ1yTh7Va6ErmLVeSIkV0ngLf88b9rNMXTHjcozBG7X5D2vpTX3L8FNtdf9Xeh\n\thZ7ZJxK85bfyG8hVO6dzjIvkGyLOYO9Y9gVpXNFM0uUicXHUGyFckDPikcn58PEv8yW3\n\t37Gg==","X-Gm-Message-State":"AOAM5303fvM2Y9L9XoRe8pFpPz2D8S1PMhgzNVXBT61rlg3FQMoRpsjW\n\taGFT+TbUC/COwoCIRDuQqc3tBoRI57nn6w==","X-Google-Smtp-Source":"ABdhPJxPYbJ196KqBmXB3iQQS7JpvyqKfSEwYK0eZqqI54e0TluiR6pCANClDP77ByC65V4Fx17abw==","X-Received":"by 2002:a19:c312:: with SMTP id\n\tt18mr5813263lff.354.1627111548242; \n\tSat, 24 Jul 2021 00:25:48 -0700 (PDT)","Date":"Sat, 24 Jul 2021 09:25:47 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Message-ID":"","References":"<20210723040036.32346-1-laurent.pinchart@ideasonboard.com>\n\t<20210723040036.32346-12-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210723040036.32346-12-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC PATCH 11/17] 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\" "}}]