[{"id":18677,"web_url":"https://patchwork.libcamera.org/comment/18677/","msgid":"<20210810133748.amtdjlvqjxo5ou4n@uno.localdomain>","date":"2021-08-10T13:37:48","subject":"Re: [libcamera-devel] [PATCH v2 03/11] libcamera: pipeline: simple:\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:40PM +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> ---\n> src/libcamera/pipeline/simple/simple.cpp | 25 ++++++++++++------------\n> 1 file changed, 13 insertions(+), 12 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index 43af3fafa475..81d342a3fa73 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -147,7 +147,7 @@ static const SimplePipelineInfo supportedDevices[] = {\n>\n> } /* namespace */\n>\n> -class SimpleCameraData : public CameraData\n> +class SimpleCameraData : public Camera::Private\n> {\n> public:\n> \tSimpleCameraData(SimplePipelineHandler *pipe,\n> @@ -213,7 +213,7 @@ private:\n> \t * reference to the camera data, store a new reference to the camera.\n> \t */\n> \tstd::shared_ptr camera_;\n> -\tconst SimpleCameraData *data_;\n> +\tSimpleCameraData *data_;\n>\n> \tconst SimpleCameraData::Configuration *pipeConfig_;\n> \tbool needConversion_;\n> @@ -246,10 +246,9 @@ protected:\n> private:\n> \tstatic constexpr unsigned int kNumInternalBuffers = 3;\n>\n> -\tSimpleCameraData *cameraData(const Camera *camera)\n> +\tSimpleCameraData *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> \tstd::vector locateSensors();\n> @@ -274,7 +273,7 @@ private:\n> SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> \t\t\t\t unsigned int numStreams,\n> \t\t\t\t MediaEntity *sensor)\n> -\t: CameraData(pipe), streams_(numStreams)\n> +\t: Camera::Private(pipe), streams_(numStreams)\n> {\n> \tint ret;\n>\n> @@ -355,7 +354,8 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n>\n> int SimpleCameraData::init()\n> {\n> -\tSimplePipelineHandler *pipe = static_cast(pipe_);\n> +\tSimplePipelineHandler *pipe =\n> +\t\tstatic_cast(this->pipe());\n> \tSimpleConverter *converter = pipe->converter();\n> \tint ret;\n>\n> @@ -480,7 +480,8 @@ int SimpleCameraData::setupLinks()\n> int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n> \t\t\t\t V4L2Subdevice::Whence whence)\n> {\n> -\tSimplePipelineHandler *pipe = static_cast(pipe_);\n> +\tSimplePipelineHandler *pipe =\n> +\t\tstatic_cast(this->pipe());\n\nAn helper could be considered\n\n> \tint ret;\n>\n> \t/*\n> @@ -581,7 +582,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n> \t}\n>\n> \t/* Adjust the requested streams. */\n> -\tSimplePipelineHandler *pipe = static_cast(data_->pipe_);\n> +\tSimplePipelineHandler *pipe = static_cast(data_->pipe());\n> \tSimpleConverter *converter = pipe->converter();\n>\n> \t/*\n> @@ -1046,10 +1047,10 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> \t\t\t std::inserter(streams, streams.end()),\n> \t\t\t [](Stream &stream) { return &stream; });\n>\n> +\t\tconst std::string &id = data->sensor_->id();\n\nWhat do you need id for ?\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> \t\tstd::shared_ptr camera =\n> -\t\t\tCamera::create(new Camera::Private(this),\n> -\t\t\t\t data->sensor_->id(), streams);\n> -\t\tregisterCamera(std::move(camera), std::move(data));\n> +\t\t\tCamera::create(data.release(), id, streams);\n> +\t\tregisterCamera(std::move(camera), nullptr);\n> \t\tregistered = true;\n> \t}\n>\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 65C6EC3240\n\tfor ;\n\tTue, 10 Aug 2021 13:37:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D33D16884D;\n\tTue, 10 Aug 2021 15:37:01 +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 45E1E687F0\n\tfor ;\n\tTue, 10 Aug 2021 15:37:01 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id BF7051BF206;\n\tTue, 10 Aug 2021 13:37:00 +0000 (UTC)"],"Date":"Tue, 10 Aug 2021 15:37:48 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20210810133748.amtdjlvqjxo5ou4n@uno.localdomain>","References":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>\n\t<20210805175848.24188-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210805175848.24188-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 03/11] libcamera: pipeline: simple:\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\" "}},{"id":18708,"web_url":"https://patchwork.libcamera.org/comment/18708/","msgid":"","date":"2021-08-11T17:08:42","subject":"Re: [libcamera-devel] [PATCH v2 03/11] libcamera: pipeline: simple:\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:37:48PM +0200, Jacopo Mondi wrote:\n> On Thu, Aug 05, 2021 at 08:58:40PM +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> > ---\n> > src/libcamera/pipeline/simple/simple.cpp | 25 ++++++++++++------------\n> > 1 file changed, 13 insertions(+), 12 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> > index 43af3fafa475..81d342a3fa73 100644\n> > --- a/src/libcamera/pipeline/simple/simple.cpp\n> > +++ b/src/libcamera/pipeline/simple/simple.cpp\n> > @@ -147,7 +147,7 @@ static const SimplePipelineInfo supportedDevices[] = {\n> >\n> > } /* namespace */\n> >\n> > -class SimpleCameraData : public CameraData\n> > +class SimpleCameraData : public Camera::Private\n> > {\n> > public:\n> > \tSimpleCameraData(SimplePipelineHandler *pipe,\n> > @@ -213,7 +213,7 @@ private:\n> > \t * reference to the camera data, store a new reference to the camera.\n> > \t */\n> > \tstd::shared_ptr camera_;\n> > -\tconst SimpleCameraData *data_;\n> > +\tSimpleCameraData *data_;\n> >\n> > \tconst SimpleCameraData::Configuration *pipeConfig_;\n> > \tbool needConversion_;\n> > @@ -246,10 +246,9 @@ protected:\n> > private:\n> > \tstatic constexpr unsigned int kNumInternalBuffers = 3;\n> >\n> > -\tSimpleCameraData *cameraData(const Camera *camera)\n> > +\tSimpleCameraData *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> > \tstd::vector locateSensors();\n> > @@ -274,7 +273,7 @@ private:\n> > SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> > \t\t\t\t unsigned int numStreams,\n> > \t\t\t\t MediaEntity *sensor)\n> > -\t: CameraData(pipe), streams_(numStreams)\n> > +\t: Camera::Private(pipe), streams_(numStreams)\n> > {\n> > \tint ret;\n> >\n> > @@ -355,7 +354,8 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> >\n> > int SimpleCameraData::init()\n> > {\n> > -\tSimplePipelineHandler *pipe = static_cast(pipe_);\n> > +\tSimplePipelineHandler *pipe =\n> > +\t\tstatic_cast(this->pipe());\n> > \tSimpleConverter *converter = pipe->converter();\n> > \tint ret;\n> >\n> > @@ -480,7 +480,8 @@ int SimpleCameraData::setupLinks()\n> > int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n> > \t\t\t\t V4L2Subdevice::Whence whence)\n> > {\n> > -\tSimplePipelineHandler *pipe = static_cast(pipe_);\n> > +\tSimplePipelineHandler *pipe =\n> > +\t\tstatic_cast(this->pipe());\n> \n> An helper could be considered\n\nGood point. I'll give it a try, possibly on top, as it's logically\nseparate from this patch I think, or in here if it makes the patch more\nreadable.\n\n> > \tint ret;\n> >\n> > \t/*\n> > @@ -581,7 +582,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n> > \t}\n> >\n> > \t/* Adjust the requested streams. */\n> > -\tSimplePipelineHandler *pipe = static_cast(data_->pipe_);\n> > +\tSimplePipelineHandler *pipe = static_cast(data_->pipe());\n> > \tSimpleConverter *converter = pipe->converter();\n> >\n> > \t/*\n> > @@ -1046,10 +1047,10 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> > \t\t\t std::inserter(streams, streams.end()),\n> > \t\t\t [](Stream &stream) { return &stream; });\n> >\n> > +\t\tconst std::string &id = data->sensor_->id();\n> \n> What do you need id for ?\n\nTo pass it to Camera::create() :-) Writing\n\n\t\t\tCamera::create(data.release(),\n\t\t\t\t data->sensor_->id(), streams);\n\nwould reference a null pointer as data.release() makes data null.\n\n> Reviewed-by: Jacopo Mondi \n> \n> > \t\tstd::shared_ptr camera =\n> > -\t\t\tCamera::create(new Camera::Private(this),\n> > -\t\t\t\t data->sensor_->id(), streams);\n> > -\t\tregisterCamera(std::move(camera), std::move(data));\n> > +\t\t\tCamera::create(data.release(), id, streams);\n> > +\t\tregisterCamera(std::move(camera), nullptr);\n> > \t\tregistered = true;\n> > \t}\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 A4536C3240\n\tfor ;\n\tWed, 11 Aug 2021 17:08:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0EC0D68864;\n\tWed, 11 Aug 2021 19:08:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BA14768826\n\tfor ;\n\tWed, 11 Aug 2021 19:08:45 +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 1E5CCEE;\n\tWed, 11 Aug 2021 19:08:45 +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=\"QpMmSCax\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628701725;\n\tbh=2F4bao9xH5jMIRHZiaJvfgV/We1naUuvQ5daE533j+0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=QpMmSCaxeMhQSJFqSEsFZakCaaHTJUzjToM7aBLaovKdywoJeUzye5GlCdAoGw+MM\n\tSFhpfN5rBLJa80leyCfgOThYjklGZ3L1GPc7bNfL3X92USHOz0rhNslFBjNtHRow5Z\n\tmAqA22nmV2Y9DLUrmk6EjYZdKelRWNTybB5HC9Ps=","Date":"Wed, 11 Aug 2021 20:08:42 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>\n\t<20210805175848.24188-4-laurent.pinchart@ideasonboard.com>\n\t<20210810133748.amtdjlvqjxo5ou4n@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210810133748.amtdjlvqjxo5ou4n@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH v2 03/11] libcamera: pipeline: simple:\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\" "}}]