[{"id":18683,"web_url":"https://patchwork.libcamera.org/comment/18683/","msgid":"<20210810135355.fd3wtwczej7upg5h@uno.localdomain>","date":"2021-08-10T13:53:55","subject":"Re: [libcamera-devel] [PATCH v2 08/11] libcamera: pipeline: ipu3:\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:45PM +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 <laurent.pinchart@ideasonboard.com>\n> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> ---\n>  src/libcamera/pipeline/ipu3/ipu3.cpp | 38 +++++++++++++---------------\n>  1 file changed, 18 insertions(+), 20 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 15d6cca609ff..6d097ac91d2e 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -53,11 +53,11 @@ static const ControlInfoMap::Map IPU3Controls = {\n>  \t{ &controls::draft::PipelineDepth, ControlInfo(2, 3) },\n>  };\n>\n> -class IPU3CameraData : public CameraData\n> +class IPU3CameraData : public Camera::Private\n>  {\n>  public:\n>  \tIPU3CameraData(PipelineHandler *pipe)\n> -\t\t: CameraData(pipe), exposureTime_(0), supportsFlips_(false)\n> +\t\t: Camera::Private(pipe), exposureTime_(0), supportsFlips_(false)\n>  \t{\n>  \t}\n>\n> @@ -146,10 +146,9 @@ public:\n>  \tbool match(DeviceEnumerator *enumerator) override;\n>\n>  private:\n> -\tIPU3CameraData *cameraData(const Camera *camera)\n> +\tIPU3CameraData *cameraData(Camera *camera)\n>  \t{\n> -\t\treturn static_cast<IPU3CameraData *>(\n> -\t\t\tPipelineHandler::cameraData(camera));\n> +\t\treturn static_cast<IPU3CameraData *>(camera->_d());\n>  \t}\n>\n>  \tint initControls(IPU3CameraData *data);\n> @@ -800,10 +799,10 @@ void IPU3CameraData::cancelPendingRequests()\n>  \t\tfor (auto it : request->buffers()) {\n>  \t\t\tFrameBuffer *buffer = it.second;\n>  \t\t\tbuffer->cancel();\n> -\t\t\tpipe_->completeBuffer(request, buffer);\n> +\t\t\tpipe()->completeBuffer(request, buffer);\n\nI wonder, being the Private class only visible internally, do we need\nto keep Camera::Private::pipe_ private ?\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n   j\n\n>  \t\t}\n>\n> -\t\tpipe_->completeRequest(request);\n> +\t\tpipe()->completeRequest(request);\n>  \t\tpendingRequests_.pop();\n>  \t}\n>  }\n> @@ -1184,12 +1183,11 @@ int PipelineHandlerIPU3::registerCameras()\n>  \t\t\t\t\t&IPU3CameraData::statBufferReady);\n>\n>  \t\t/* Create and register the Camera instance. */\n> -\t\tstd::string cameraId = cio2->sensor()->id();\n> +\t\tconst std::string &cameraId = cio2->sensor()->id();\n>  \t\tstd::shared_ptr<Camera> camera =\n> -\t\t\tCamera::create(new Camera::Private(this), cameraId,\n> -\t\t\t\t       streams);\n> +\t\t\tCamera::create(data.release(), cameraId, streams);\n>\n> -\t\tregisterCamera(std::move(camera), std::move(data));\n> +\t\tregisterCamera(std::move(camera), nullptr);\n>\n>  \t\tLOG(IPU3, Info)\n>  \t\t\t<< \"Registered Camera[\" << numCameras << \"] \\\"\"\n> @@ -1204,7 +1202,7 @@ int PipelineHandlerIPU3::registerCameras()\n>\n>  int IPU3CameraData::loadIPA()\n>  {\n> -\tipa_ = IPAManager::createIPA<ipa::ipu3::IPAProxyIPU3>(pipe_, 1, 1);\n> +\tipa_ = IPAManager::createIPA<ipa::ipu3::IPAProxyIPU3>(pipe(), 1, 1);\n>  \tif (!ipa_)\n>  \t\treturn -ENOENT;\n>\n> @@ -1261,7 +1259,7 @@ void IPU3CameraData::queueFrameAction(unsigned int id,\n>\n>  \t\tinfo->metadataProcessed = true;\n>  \t\tif (frameInfos_.tryComplete(info))\n> -\t\t\tpipe_->completeRequest(request);\n> +\t\t\tpipe()->completeRequest(request);\n>\n>  \t\tbreak;\n>  \t}\n> @@ -1289,7 +1287,7 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n>\n>  \tRequest *request = info->request;\n>\n> -\tpipe_->completeBuffer(request, buffer);\n> +\tpipe()->completeBuffer(request, buffer);\n>\n>  \trequest->metadata().set(controls::draft::PipelineDepth, 3);\n>  \t/* \\todo Move the ExposureTime control to the IPA. */\n> @@ -1300,7 +1298,7 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n>  \trequest->metadata().set(controls::ScalerCrop, cropRegion_);\n>\n>  \tif (frameInfos_.tryComplete(info))\n> -\t\tpipe_->completeRequest(request);\n> +\t\tpipe()->completeRequest(request);\n>  }\n>\n>  /**\n> @@ -1332,16 +1330,16 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n>  \t\tfor (auto it : request->buffers()) {\n>  \t\t\tFrameBuffer *b = it.second;\n>  \t\t\tb->cancel();\n> -\t\t\tpipe_->completeBuffer(request, b);\n> +\t\t\tpipe()->completeBuffer(request, b);\n>  \t\t}\n>\n>  \t\tframeInfos_.remove(info);\n> -\t\tpipe_->completeRequest(request);\n> +\t\tpipe()->completeRequest(request);\n>  \t\treturn;\n>  \t}\n>\n>  \tif (request->findBuffer(&rawStream_))\n> -\t\tpipe_->completeBuffer(request, buffer);\n> +\t\tpipe()->completeBuffer(request, buffer);\n>\n>  \tipa::ipu3::IPU3Event ev;\n>  \tev.op = ipa::ipu3::EventFillParams;\n> @@ -1367,7 +1365,7 @@ void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n>  \tRequest *request = info->request;\n>\n>  \tif (frameInfos_.tryComplete(info))\n> -\t\tpipe_->completeRequest(request);\n> +\t\tpipe()->completeRequest(request);\n>  }\n>\n>  void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n> @@ -1386,7 +1384,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n>  \t\t * In that event, we must have obtained the Request before hand.\n>  \t\t */\n>  \t\tif (frameInfos_.tryComplete(info))\n> -\t\t\tpipe_->completeRequest(request);\n> +\t\t\tpipe()->completeRequest(request);\n>\n>  \t\treturn;\n>  \t}\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 8FB22BD87D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 10 Aug 2021 13:53:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 24E3C6884F;\n\tTue, 10 Aug 2021 15:53:08 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 60C73687F0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Aug 2021 15:53:07 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id D8CD21C0003;\n\tTue, 10 Aug 2021 13:53:06 +0000 (UTC)"],"Date":"Tue, 10 Aug 2021 15:53:55 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Message-ID":"<20210810135355.fd3wtwczej7upg5h@uno.localdomain>","References":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>\n\t<20210805175848.24188-9-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-9-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 08/11] libcamera: pipeline: ipu3:\n\tMigrate to Camera::Private","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":18709,"web_url":"https://patchwork.libcamera.org/comment/18709/","msgid":"<YRQFkamM1ERRzrg8@pendragon.ideasonboard.com>","date":"2021-08-11T17:14:57","subject":"Re: [libcamera-devel] [PATCH v2 08/11] libcamera: pipeline: ipu3:\n\tMigrate to Camera::Private","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Tue, Aug 10, 2021 at 03:53:55PM +0200, Jacopo Mondi wrote:\n> On Thu, Aug 05, 2021 at 08:58:45PM +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 <laurent.pinchart@ideasonboard.com>\n> > Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> > ---\n> >  src/libcamera/pipeline/ipu3/ipu3.cpp | 38 +++++++++++++---------------\n> >  1 file changed, 18 insertions(+), 20 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index 15d6cca609ff..6d097ac91d2e 100644\n> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > @@ -53,11 +53,11 @@ static const ControlInfoMap::Map IPU3Controls = {\n> >  \t{ &controls::draft::PipelineDepth, ControlInfo(2, 3) },\n> >  };\n> >\n> > -class IPU3CameraData : public CameraData\n> > +class IPU3CameraData : public Camera::Private\n> >  {\n> >  public:\n> >  \tIPU3CameraData(PipelineHandler *pipe)\n> > -\t\t: CameraData(pipe), exposureTime_(0), supportsFlips_(false)\n> > +\t\t: Camera::Private(pipe), exposureTime_(0), supportsFlips_(false)\n> >  \t{\n> >  \t}\n> >\n> > @@ -146,10 +146,9 @@ public:\n> >  \tbool match(DeviceEnumerator *enumerator) override;\n> >\n> >  private:\n> > -\tIPU3CameraData *cameraData(const Camera *camera)\n> > +\tIPU3CameraData *cameraData(Camera *camera)\n> >  \t{\n> > -\t\treturn static_cast<IPU3CameraData *>(\n> > -\t\t\tPipelineHandler::cameraData(camera));\n> > +\t\treturn static_cast<IPU3CameraData *>(camera->_d());\n> >  \t}\n> >\n> >  \tint initControls(IPU3CameraData *data);\n> > @@ -800,10 +799,10 @@ void IPU3CameraData::cancelPendingRequests()\n> >  \t\tfor (auto it : request->buffers()) {\n> >  \t\t\tFrameBuffer *buffer = it.second;\n> >  \t\t\tbuffer->cancel();\n> > -\t\t\tpipe_->completeBuffer(request, buffer);\n> > +\t\t\tpipe()->completeBuffer(request, buffer);\n> \n> I wonder, being the Private class only visible internally, do we need\n> to keep Camera::Private::pipe_ private ?\n\nMaking it private makes it impossible to inadvertently modify the\npointer in the derived class. This brings a bit of additional safety.\n\n> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n> \n> >  \t\t}\n> >\n> > -\t\tpipe_->completeRequest(request);\n> > +\t\tpipe()->completeRequest(request);\n> >  \t\tpendingRequests_.pop();\n> >  \t}\n> >  }\n> > @@ -1184,12 +1183,11 @@ int PipelineHandlerIPU3::registerCameras()\n> >  \t\t\t\t\t&IPU3CameraData::statBufferReady);\n> >\n> >  \t\t/* Create and register the Camera instance. */\n> > -\t\tstd::string cameraId = cio2->sensor()->id();\n> > +\t\tconst std::string &cameraId = cio2->sensor()->id();\n> >  \t\tstd::shared_ptr<Camera> camera =\n> > -\t\t\tCamera::create(new Camera::Private(this), cameraId,\n> > -\t\t\t\t       streams);\n> > +\t\t\tCamera::create(data.release(), cameraId, streams);\n> >\n> > -\t\tregisterCamera(std::move(camera), std::move(data));\n> > +\t\tregisterCamera(std::move(camera), nullptr);\n> >\n> >  \t\tLOG(IPU3, Info)\n> >  \t\t\t<< \"Registered Camera[\" << numCameras << \"] \\\"\"\n> > @@ -1204,7 +1202,7 @@ int PipelineHandlerIPU3::registerCameras()\n> >\n> >  int IPU3CameraData::loadIPA()\n> >  {\n> > -\tipa_ = IPAManager::createIPA<ipa::ipu3::IPAProxyIPU3>(pipe_, 1, 1);\n> > +\tipa_ = IPAManager::createIPA<ipa::ipu3::IPAProxyIPU3>(pipe(), 1, 1);\n> >  \tif (!ipa_)\n> >  \t\treturn -ENOENT;\n> >\n> > @@ -1261,7 +1259,7 @@ void IPU3CameraData::queueFrameAction(unsigned int id,\n> >\n> >  \t\tinfo->metadataProcessed = true;\n> >  \t\tif (frameInfos_.tryComplete(info))\n> > -\t\t\tpipe_->completeRequest(request);\n> > +\t\t\tpipe()->completeRequest(request);\n> >\n> >  \t\tbreak;\n> >  \t}\n> > @@ -1289,7 +1287,7 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n> >\n> >  \tRequest *request = info->request;\n> >\n> > -\tpipe_->completeBuffer(request, buffer);\n> > +\tpipe()->completeBuffer(request, buffer);\n> >\n> >  \trequest->metadata().set(controls::draft::PipelineDepth, 3);\n> >  \t/* \\todo Move the ExposureTime control to the IPA. */\n> > @@ -1300,7 +1298,7 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n> >  \trequest->metadata().set(controls::ScalerCrop, cropRegion_);\n> >\n> >  \tif (frameInfos_.tryComplete(info))\n> > -\t\tpipe_->completeRequest(request);\n> > +\t\tpipe()->completeRequest(request);\n> >  }\n> >\n> >  /**\n> > @@ -1332,16 +1330,16 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n> >  \t\tfor (auto it : request->buffers()) {\n> >  \t\t\tFrameBuffer *b = it.second;\n> >  \t\t\tb->cancel();\n> > -\t\t\tpipe_->completeBuffer(request, b);\n> > +\t\t\tpipe()->completeBuffer(request, b);\n> >  \t\t}\n> >\n> >  \t\tframeInfos_.remove(info);\n> > -\t\tpipe_->completeRequest(request);\n> > +\t\tpipe()->completeRequest(request);\n> >  \t\treturn;\n> >  \t}\n> >\n> >  \tif (request->findBuffer(&rawStream_))\n> > -\t\tpipe_->completeBuffer(request, buffer);\n> > +\t\tpipe()->completeBuffer(request, buffer);\n> >\n> >  \tipa::ipu3::IPU3Event ev;\n> >  \tev.op = ipa::ipu3::EventFillParams;\n> > @@ -1367,7 +1365,7 @@ void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n> >  \tRequest *request = info->request;\n> >\n> >  \tif (frameInfos_.tryComplete(info))\n> > -\t\tpipe_->completeRequest(request);\n> > +\t\tpipe()->completeRequest(request);\n> >  }\n> >\n> >  void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n> > @@ -1386,7 +1384,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n> >  \t\t * In that event, we must have obtained the Request before hand.\n> >  \t\t */\n> >  \t\tif (frameInfos_.tryComplete(info))\n> > -\t\t\tpipe_->completeRequest(request);\n> > +\t\t\tpipe()->completeRequest(request);\n> >\n> >  \t\treturn;\n> >  \t}","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 3DD76BD87D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 11 Aug 2021 17:15:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 95BA46884F;\n\tWed, 11 Aug 2021 19:15:02 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4814568826\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 11 Aug 2021 19:15:01 +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 BB0A8EE;\n\tWed, 11 Aug 2021 19:15:00 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"gXTyuLkt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628702100;\n\tbh=eO/RyB4uI6W3ZIqdHa2OEDtCvE85A5NlZCfmSiaawdc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=gXTyuLktD4mRNrJYUJeB14+UTyJVoog+weoYq/HnsjM+cTzNTe79UE8yzFRgQMtTl\n\ttbmFBRZTGKEWdNPfiQ0yv+SYQBOxKmJ3doMLEZPx4fKppT3ZVEmN5KL+Oa6B53XdZZ\n\tVYRRFC5o5iXaoc6yj6mcz6Z3rE1Hl7ULCUii2Dpc=","Date":"Wed, 11 Aug 2021 20:14:57 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<YRQFkamM1ERRzrg8@pendragon.ideasonboard.com>","References":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>\n\t<20210805175848.24188-9-laurent.pinchart@ideasonboard.com>\n\t<20210810135355.fd3wtwczej7upg5h@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210810135355.fd3wtwczej7upg5h@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH v2 08/11] libcamera: pipeline: ipu3:\n\tMigrate to Camera::Private","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]