[{"id":14236,"web_url":"https://patchwork.libcamera.org/comment/14236/","msgid":"<20201214022051.GB2095@pyrite.rasen.tech>","date":"2020-12-14T02:20:51","subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: Manage\n\tresources with std::unique_ptr<>","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Sat, Dec 12, 2020 at 08:51:16PM +0200, Laurent Pinchart wrote:\n> Replace manual resource destruction with std::unique_ptr<> where\n> applicable. This removes the need for several destructors.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/pipeline/ipu3/cio2.cpp | 11 ++---------\n> src/libcamera/pipeline/ipu3/cio2.h | 9 ++++-----\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 19 +++++++------------\n> src/libcamera/pipeline/simple/converter.cpp | 8 +-------\n> src/libcamera/pipeline/simple/converter.h | 3 +--\n> src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 12 ++++--------\n> src/libcamera/pipeline/vimc/vimc.cpp | 11 +++--------\n> 7 files changed, 22 insertions(+), 51 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> index 821715e325b4..bd5260d5b288 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> @@ -33,16 +33,9 @@ const std::map mbusCodesToPixelFormat = {\n> } /* namespace */\n> \n> CIO2Device::CIO2Device()\n> -\t: sensor_(nullptr), csi2_(nullptr)\n> {\n> }\n> \n> -CIO2Device::~CIO2Device()\n> -{\n> -\tdelete csi2_;\n> -\tdelete sensor_;\n> -}\n> -\n> /**\n> * \\brief Retrieve the list of supported PixelFormats\n> *\n> @@ -117,7 +110,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> \n> \tMediaLink *link = links[0];\n> \tMediaEntity *sensorEntity = link->source()->entity();\n> -\tsensor_ = new CameraSensor(sensorEntity);\n> +\tsensor_ = std::make_unique(sensorEntity);\n> \tret = sensor_->init();\n> \tif (ret)\n> \t\treturn ret;\n> @@ -148,7 +141,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> \t * might impact on power consumption.\n> \t */\n> \n> -\tcsi2_ = new V4L2Subdevice(csi2Entity);\n> +\tcsi2_ = std::make_unique(csi2Entity);\n> \tret = csi2_->open();\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\n> index 0dca9673ca07..236ad287354a 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.h\n> +++ b/src/libcamera/pipeline/ipu3/cio2.h\n> @@ -33,7 +33,6 @@ public:\n> \tstatic constexpr unsigned int CIO2_BUFFER_COUNT = 4;\n> \n> \tCIO2Device();\n> -\t~CIO2Device();\n> \n> \tstd::vector formats() const;\n> \tstd::vector sizes() const;\n> @@ -49,8 +48,8 @@ public:\n> \tint start();\n> \tint stop();\n> \n> -\tCameraSensor *sensor() { return sensor_; }\n> -\tconst CameraSensor *sensor() const { return sensor_; }\n> +\tCameraSensor *sensor() { return sensor_.get(); }\n> +\tconst CameraSensor *sensor() const { return sensor_.get(); }\n> \n> \tint queueBuffer(Request *request, FrameBuffer *rawBuffer);\n> \tvoid tryReturnBuffer(FrameBuffer *buffer);\n> @@ -61,8 +60,8 @@ private:\n> \n> \tvoid cio2BufferReady(FrameBuffer *buffer);\n> \n> -\tCameraSensor *sensor_;\n> -\tV4L2Subdevice *csi2_;\n> +\tstd::unique_ptr sensor_;\n> +\tstd::unique_ptr csi2_;\n> \tstd::unique_ptr output_;\n> \n> \tstd::vector> buffers_;\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 4d98c9027f42..021d0ffe3ffb 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -121,21 +121,16 @@ class RkISP1CameraData : public CameraData\n> public:\n> \tRkISP1CameraData(PipelineHandler *pipe, RkISP1MainPath *mainPath,\n> \t\t\t RkISP1SelfPath *selfPath)\n> -\t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n> -\t\t frameInfo_(pipe), mainPath_(mainPath), selfPath_(selfPath)\n> +\t\t: CameraData(pipe), frame_(0), frameInfo_(pipe),\n> +\t\t mainPath_(mainPath), selfPath_(selfPath)\n> \t{\n> \t}\n> \n> -\t~RkISP1CameraData()\n> -\t{\n> -\t\tdelete sensor_;\n> -\t}\n> -\n> \tint loadIPA();\n> \n> \tStream mainPathStream_;\n> \tStream selfPathStream_;\n> -\tCameraSensor *sensor_;\n> +\tstd::unique_ptr sensor_;\n> \tunsigned int frame_;\n> \tstd::vector ipaBuffers_;\n> \tRkISP1Frames frameInfo_;\n> @@ -430,7 +425,7 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,\n> \tcase RKISP1_IPA_ACTION_V4L2_SET: {\n> \t\tconst ControlList &controls = action.controls[0];\n> \t\ttimeline_.scheduleAction(std::make_unique(frame,\n> -\t\t\t\t\t\t\t\t\t\t sensor_,\n> +\t\t\t\t\t\t\t\t\t\t sensor_.get(),\n> \t\t\t\t\t\t\t\t\t\t controls));\n> \t\tbreak;\n> \t}\n> @@ -489,7 +484,7 @@ bool RkISP1CameraConfiguration::fitsAllPaths(const StreamConfiguration &cfg)\n> \n> CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> {\n> -\tconst CameraSensor *sensor = data_->sensor_;\n> +\tconst CameraSensor *sensor = data_->sensor_.get();\n> \tStatus status = Valid;\n\nWhat's wrong with using the unique_ptr here directly?\n\nJust wondering though, so\n\nReviewed-by: Paul Elder \n\n> \tif (config_.empty())\n> @@ -660,7 +655,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> \tRkISP1CameraConfiguration *config =\n> \t\tstatic_cast(c);\n> \tRkISP1CameraData *data = cameraData(camera);\n> -\tCameraSensor *sensor = data->sensor_;\n> +\tCameraSensor *sensor = data->sensor_.get();\n> \tint ret;\n> \n> \tret = initLinks(camera, sensor, *config);\n> @@ -1035,7 +1030,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n> \n> \tdata->controlInfo_ = std::move(ctrls);\n> \n> -\tdata->sensor_ = new CameraSensor(sensor);\n> +\tdata->sensor_ = std::make_unique(sensor);\n> \tret = data->sensor_->init();\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> index 67e6e864aa0a..a6a8e139cb3e 100644\n> --- a/src/libcamera/pipeline/simple/converter.cpp\n> +++ b/src/libcamera/pipeline/simple/converter.cpp\n> @@ -24,7 +24,6 @@ namespace libcamera {\n> LOG_DECLARE_CATEGORY(SimplePipeline)\n> \n> SimpleConverter::SimpleConverter(MediaDevice *media)\n> -\t: m2m_(nullptr)\n> {\n> \t/*\n> \t * Locate the video node. There's no need to validate the pipeline\n> @@ -38,17 +37,12 @@ SimpleConverter::SimpleConverter(MediaDevice *media)\n> \tif (it == entities.end())\n> \t\treturn;\n> \n> -\tm2m_ = new V4L2M2MDevice((*it)->deviceNode());\n> +\tm2m_ = std::make_unique((*it)->deviceNode());\n> \n> \tm2m_->output()->bufferReady.connect(this, &SimpleConverter::outputBufferReady);\n> \tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::captureBufferReady);\n> }\n> \n> -SimpleConverter::~SimpleConverter()\n> -{\n> -\tdelete m2m_;\n> -}\n> -\n> int SimpleConverter::open()\n> {\n> \tif (!m2m_)\n> diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\n> index 78296680aa14..a3c4d899cfc8 100644\n> --- a/src/libcamera/pipeline/simple/converter.h\n> +++ b/src/libcamera/pipeline/simple/converter.h\n> @@ -29,7 +29,6 @@ class SimpleConverter\n> {\n> public:\n> \tSimpleConverter(MediaDevice *media);\n> -\t~SimpleConverter();\n> \n> \tint open();\n> \tvoid close();\n> @@ -56,7 +55,7 @@ private:\n> \tvoid captureBufferReady(FrameBuffer *buffer);\n> \tvoid outputBufferReady(FrameBuffer *buffer);\n> \n> -\tV4L2M2MDevice *m2m_;\n> +\tstd::unique_ptr m2m_;\n> \n> \tstd::queue captureDoneQueue_;\n> \tstd::queue outputDoneQueue_;\n> diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> index 87b0f03d143a..e54f45bb8825 100644\n> --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> @@ -9,6 +9,7 @@\n> #include \n> #include \n> #include \n> +#include \n> #include \n> \n> #include \n> @@ -35,21 +36,16 @@ class UVCCameraData : public CameraData\n> {\n> public:\n> \tUVCCameraData(PipelineHandler *pipe)\n> -\t\t: CameraData(pipe), video_(nullptr)\n> +\t\t: CameraData(pipe)\n> \t{\n> \t}\n> \n> -\t~UVCCameraData()\n> -\t{\n> -\t\tdelete video_;\n> -\t}\n> -\n> \tint init(MediaDevice *media);\n> \tvoid addControl(uint32_t cid, const ControlInfo &v4l2info,\n> \t\t\tControlInfoMap::Map *ctrls);\n> \tvoid bufferReady(FrameBuffer *buffer);\n> \n> -\tV4L2VideoDevice *video_;\n> +\tstd::unique_ptr video_;\n> \tStream stream_;\n> };\n> \n> @@ -499,7 +495,7 @@ int UVCCameraData::init(MediaDevice *media)\n> \t}\n> \n> \t/* Create and open the video device. */\n> -\tvideo_ = new V4L2VideoDevice(*entity);\n> +\tvideo_ = std::make_unique(*entity);\n> \tret = video_->open();\n> \tif (ret)\n> \t\treturn ret;\n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index 72256f5b4190..8bda746f3136 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -42,20 +42,15 @@ class VimcCameraData : public CameraData\n> {\n> public:\n> \tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n> -\t\t: CameraData(pipe), media_(media), sensor_(nullptr)\n> +\t\t: CameraData(pipe), media_(media)\n> \t{\n> \t}\n> \n> -\t~VimcCameraData()\n> -\t{\n> -\t\tdelete sensor_;\n> -\t}\n> -\n> \tint init();\n> \tvoid bufferReady(FrameBuffer *buffer);\n> \n> \tMediaDevice *media_;\n> -\tCameraSensor *sensor_;\n> +\tstd::unique_ptr sensor_;\n> \tstd::unique_ptr debayer_;\n> \tstd::unique_ptr scaler_;\n> \tstd::unique_ptr video_;\n> @@ -461,7 +456,7 @@ int VimcCameraData::init()\n> \t\treturn ret;\n> \n> \t/* Create and open the camera sensor, debayer, scaler and video device. */\n> -\tsensor_ = new CameraSensor(media_->getEntityByName(\"Sensor B\"));\n> +\tsensor_ = std::make_unique(media_->getEntityByName(\"Sensor B\"));\n> \tret = sensor_->init();\n> \tif (ret)\n> \t\treturn ret;\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 012C9C0F1A\n\tfor ;\n\tMon, 14 Dec 2020 02:21:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7BAF06158A;\n\tMon, 14 Dec 2020 03:21:00 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A2C1600EB\n\tfor ;\n\tMon, 14 Dec 2020 03:20:59 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E03CF96;\n\tMon, 14 Dec 2020 03:20:57 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"gFXhAIJz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607912459;\n\tbh=5aGa02UNLQACTQ2Hwd+dtZFdFK5k3m2+VDctSXF8KnQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=gFXhAIJzHRTWH1WONwavQO/fv55A5jH1Qqb7JNYpXyw//vXbFQ2M8Pm9KvluFp+JJ\n\tcW0s8sG9z4xwzeaKCihsL/zXYMj7nRHGw2mfv6SNtt8oizoidnNjQEzWgKCaAaPAOh\n\tDGxhQYgYeDCq0zvS82FWsSeFDwhT+rRuea4bk/KY=","Date":"Mon, 14 Dec 2020 11:20:51 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20201214022051.GB2095@pyrite.rasen.tech>","References":"<20201212185116.29611-1-laurent.pinchart@ideasonboard.com>\n\t<20201212185116.29611-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201212185116.29611-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: Manage\n\tresources with std::unique_ptr<>","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14245,"web_url":"https://patchwork.libcamera.org/comment/14245/","msgid":"","date":"2020-12-14T13:47:39","subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: Manage\n\tresources with std::unique_ptr<>","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nOn Mon, Dec 14, 2020 at 11:20:51AM +0900, paul.elder@ideasonboard.com wrote:\n> On Sat, Dec 12, 2020 at 08:51:16PM +0200, Laurent Pinchart wrote:\n> > Replace manual resource destruction with std::unique_ptr<> where\n> > applicable. This removes the need for several destructors.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > src/libcamera/pipeline/ipu3/cio2.cpp | 11 ++---------\n> > src/libcamera/pipeline/ipu3/cio2.h | 9 ++++-----\n> > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 19 +++++++------------\n> > src/libcamera/pipeline/simple/converter.cpp | 8 +-------\n> > src/libcamera/pipeline/simple/converter.h | 3 +--\n> > src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 12 ++++--------\n> > src/libcamera/pipeline/vimc/vimc.cpp | 11 +++--------\n> > 7 files changed, 22 insertions(+), 51 deletions(-)\n> > \n> > diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> > index 821715e325b4..bd5260d5b288 100644\n> > --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> > @@ -33,16 +33,9 @@ const std::map mbusCodesToPixelFormat = {\n> > } /* namespace */\n> > \n> > CIO2Device::CIO2Device()\n> > -\t: sensor_(nullptr), csi2_(nullptr)\n> > {\n> > }\n> > \n> > -CIO2Device::~CIO2Device()\n> > -{\n> > -\tdelete csi2_;\n> > -\tdelete sensor_;\n> > -}\n> > -\n> > /**\n> > * \\brief Retrieve the list of supported PixelFormats\n> > *\n> > @@ -117,7 +110,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> > \n> > \tMediaLink *link = links[0];\n> > \tMediaEntity *sensorEntity = link->source()->entity();\n> > -\tsensor_ = new CameraSensor(sensorEntity);\n> > +\tsensor_ = std::make_unique(sensorEntity);\n> > \tret = sensor_->init();\n> > \tif (ret)\n> > \t\treturn ret;\n> > @@ -148,7 +141,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> > \t * might impact on power consumption.\n> > \t */\n> > \n> > -\tcsi2_ = new V4L2Subdevice(csi2Entity);\n> > +\tcsi2_ = std::make_unique(csi2Entity);\n> > \tret = csi2_->open();\n> > \tif (ret)\n> > \t\treturn ret;\n> > diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\n> > index 0dca9673ca07..236ad287354a 100644\n> > --- a/src/libcamera/pipeline/ipu3/cio2.h\n> > +++ b/src/libcamera/pipeline/ipu3/cio2.h\n> > @@ -33,7 +33,6 @@ public:\n> > \tstatic constexpr unsigned int CIO2_BUFFER_COUNT = 4;\n> > \n> > \tCIO2Device();\n> > -\t~CIO2Device();\n> > \n> > \tstd::vector formats() const;\n> > \tstd::vector sizes() const;\n> > @@ -49,8 +48,8 @@ public:\n> > \tint start();\n> > \tint stop();\n> > \n> > -\tCameraSensor *sensor() { return sensor_; }\n> > -\tconst CameraSensor *sensor() const { return sensor_; }\n> > +\tCameraSensor *sensor() { return sensor_.get(); }\n> > +\tconst CameraSensor *sensor() const { return sensor_.get(); }\n> > \n> > \tint queueBuffer(Request *request, FrameBuffer *rawBuffer);\n> > \tvoid tryReturnBuffer(FrameBuffer *buffer);\n> > @@ -61,8 +60,8 @@ private:\n> > \n> > \tvoid cio2BufferReady(FrameBuffer *buffer);\n> > \n> > -\tCameraSensor *sensor_;\n> > -\tV4L2Subdevice *csi2_;\n> > +\tstd::unique_ptr sensor_;\n> > +\tstd::unique_ptr csi2_;\n> > \tstd::unique_ptr output_;\n> > \n> > \tstd::vector> buffers_;\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index 4d98c9027f42..021d0ffe3ffb 100644\n> > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > @@ -121,21 +121,16 @@ class RkISP1CameraData : public CameraData\n> > public:\n> > \tRkISP1CameraData(PipelineHandler *pipe, RkISP1MainPath *mainPath,\n> > \t\t\t RkISP1SelfPath *selfPath)\n> > -\t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n> > -\t\t frameInfo_(pipe), mainPath_(mainPath), selfPath_(selfPath)\n> > +\t\t: CameraData(pipe), frame_(0), frameInfo_(pipe),\n> > +\t\t mainPath_(mainPath), selfPath_(selfPath)\n> > \t{\n> > \t}\n> > \n> > -\t~RkISP1CameraData()\n> > -\t{\n> > -\t\tdelete sensor_;\n> > -\t}\n> > -\n> > \tint loadIPA();\n> > \n> > \tStream mainPathStream_;\n> > \tStream selfPathStream_;\n> > -\tCameraSensor *sensor_;\n> > +\tstd::unique_ptr sensor_;\n> > \tunsigned int frame_;\n> > \tstd::vector ipaBuffers_;\n> > \tRkISP1Frames frameInfo_;\n> > @@ -430,7 +425,7 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,\n> > \tcase RKISP1_IPA_ACTION_V4L2_SET: {\n> > \t\tconst ControlList &controls = action.controls[0];\n> > \t\ttimeline_.scheduleAction(std::make_unique(frame,\n> > -\t\t\t\t\t\t\t\t\t\t sensor_,\n> > +\t\t\t\t\t\t\t\t\t\t sensor_.get(),\n> > \t\t\t\t\t\t\t\t\t\t controls));\n> > \t\tbreak;\n> > \t}\n> > @@ -489,7 +484,7 @@ bool RkISP1CameraConfiguration::fitsAllPaths(const StreamConfiguration &cfg)\n> > \n> > CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> > {\n> > -\tconst CameraSensor *sensor = data_->sensor_;\n> > +\tconst CameraSensor *sensor = data_->sensor_.get();\n> > \tStatus status = Valid;\n> \n> What's wrong with using the unique_ptr here directly?\n\nNothing as such. We could s/sensor/data_->sensor_/ in the function. The\nlocal sensor variable is just a shorthand. We could also write\n\n\tconst std::unique_ptr &sensor = data_->sensor_;\n\nbut that seems a bit more complicated. Would you prefer that ?\n\n> Just wondering though, so\n> \n> Reviewed-by: Paul Elder \n> \n> > \tif (config_.empty())\n> > @@ -660,7 +655,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> > \tRkISP1CameraConfiguration *config =\n> > \t\tstatic_cast(c);\n> > \tRkISP1CameraData *data = cameraData(camera);\n> > -\tCameraSensor *sensor = data->sensor_;\n> > +\tCameraSensor *sensor = data->sensor_.get();\n> > \tint ret;\n> > \n> > \tret = initLinks(camera, sensor, *config);\n> > @@ -1035,7 +1030,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n> > \n> > \tdata->controlInfo_ = std::move(ctrls);\n> > \n> > -\tdata->sensor_ = new CameraSensor(sensor);\n> > +\tdata->sensor_ = std::make_unique(sensor);\n> > \tret = data->sensor_->init();\n> > \tif (ret)\n> > \t\treturn ret;\n> > diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> > index 67e6e864aa0a..a6a8e139cb3e 100644\n> > --- a/src/libcamera/pipeline/simple/converter.cpp\n> > +++ b/src/libcamera/pipeline/simple/converter.cpp\n> > @@ -24,7 +24,6 @@ namespace libcamera {\n> > LOG_DECLARE_CATEGORY(SimplePipeline)\n> > \n> > SimpleConverter::SimpleConverter(MediaDevice *media)\n> > -\t: m2m_(nullptr)\n> > {\n> > \t/*\n> > \t * Locate the video node. There's no need to validate the pipeline\n> > @@ -38,17 +37,12 @@ SimpleConverter::SimpleConverter(MediaDevice *media)\n> > \tif (it == entities.end())\n> > \t\treturn;\n> > \n> > -\tm2m_ = new V4L2M2MDevice((*it)->deviceNode());\n> > +\tm2m_ = std::make_unique((*it)->deviceNode());\n> > \n> > \tm2m_->output()->bufferReady.connect(this, &SimpleConverter::outputBufferReady);\n> > \tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::captureBufferReady);\n> > }\n> > \n> > -SimpleConverter::~SimpleConverter()\n> > -{\n> > -\tdelete m2m_;\n> > -}\n> > -\n> > int SimpleConverter::open()\n> > {\n> > \tif (!m2m_)\n> > diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\n> > index 78296680aa14..a3c4d899cfc8 100644\n> > --- a/src/libcamera/pipeline/simple/converter.h\n> > +++ b/src/libcamera/pipeline/simple/converter.h\n> > @@ -29,7 +29,6 @@ class SimpleConverter\n> > {\n> > public:\n> > \tSimpleConverter(MediaDevice *media);\n> > -\t~SimpleConverter();\n> > \n> > \tint open();\n> > \tvoid close();\n> > @@ -56,7 +55,7 @@ private:\n> > \tvoid captureBufferReady(FrameBuffer *buffer);\n> > \tvoid outputBufferReady(FrameBuffer *buffer);\n> > \n> > -\tV4L2M2MDevice *m2m_;\n> > +\tstd::unique_ptr m2m_;\n> > \n> > \tstd::queue captureDoneQueue_;\n> > \tstd::queue outputDoneQueue_;\n> > diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> > index 87b0f03d143a..e54f45bb8825 100644\n> > --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> > +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> > @@ -9,6 +9,7 @@\n> > #include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > \n> > #include \n> > @@ -35,21 +36,16 @@ class UVCCameraData : public CameraData\n> > {\n> > public:\n> > \tUVCCameraData(PipelineHandler *pipe)\n> > -\t\t: CameraData(pipe), video_(nullptr)\n> > +\t\t: CameraData(pipe)\n> > \t{\n> > \t}\n> > \n> > -\t~UVCCameraData()\n> > -\t{\n> > -\t\tdelete video_;\n> > -\t}\n> > -\n> > \tint init(MediaDevice *media);\n> > \tvoid addControl(uint32_t cid, const ControlInfo &v4l2info,\n> > \t\t\tControlInfoMap::Map *ctrls);\n> > \tvoid bufferReady(FrameBuffer *buffer);\n> > \n> > -\tV4L2VideoDevice *video_;\n> > +\tstd::unique_ptr video_;\n> > \tStream stream_;\n> > };\n> > \n> > @@ -499,7 +495,7 @@ int UVCCameraData::init(MediaDevice *media)\n> > \t}\n> > \n> > \t/* Create and open the video device. */\n> > -\tvideo_ = new V4L2VideoDevice(*entity);\n> > +\tvideo_ = std::make_unique(*entity);\n> > \tret = video_->open();\n> > \tif (ret)\n> > \t\treturn ret;\n> > diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> > index 72256f5b4190..8bda746f3136 100644\n> > --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> > +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> > @@ -42,20 +42,15 @@ class VimcCameraData : public CameraData\n> > {\n> > public:\n> > \tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n> > -\t\t: CameraData(pipe), media_(media), sensor_(nullptr)\n> > +\t\t: CameraData(pipe), media_(media)\n> > \t{\n> > \t}\n> > \n> > -\t~VimcCameraData()\n> > -\t{\n> > -\t\tdelete sensor_;\n> > -\t}\n> > -\n> > \tint init();\n> > \tvoid bufferReady(FrameBuffer *buffer);\n> > \n> > \tMediaDevice *media_;\n> > -\tCameraSensor *sensor_;\n> > +\tstd::unique_ptr sensor_;\n> > \tstd::unique_ptr debayer_;\n> > \tstd::unique_ptr scaler_;\n> > \tstd::unique_ptr video_;\n> > @@ -461,7 +456,7 @@ int VimcCameraData::init()\n> > \t\treturn ret;\n> > \n> > \t/* Create and open the camera sensor, debayer, scaler and video device. */\n> > -\tsensor_ = new CameraSensor(media_->getEntityByName(\"Sensor B\"));\n> > +\tsensor_ = std::make_unique(media_->getEntityByName(\"Sensor B\"));\n> > \tret = sensor_->init();\n> > \tif (ret)\n> > \t\treturn ret;","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 A2501BD80A\n\tfor ;\n\tMon, 14 Dec 2020 13:47:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2F0FA61590;\n\tMon, 14 Dec 2020 14:47:48 +0100 (CET)","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 4CFCC60321\n\tfor ;\n\tMon, 14 Dec 2020 14:47:46 +0100 (CET)","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 7D15996;\n\tMon, 14 Dec 2020 14:47:45 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"gCnzqiJM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607953665;\n\tbh=qhjCJUg8DCzNpqCHQlS5+MN045NTSk3Kz45Wer9jZzc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=gCnzqiJM6qkZAT8F5ollc5t6DR4VAVNSGPFF+RSxnP7OQwcbH/ApWSV/M7Z5j5u1G\n\tC0BS6gN9QjaHj6FV2vuDKcNDll7iT3fYQecOheO6xXLT8NzxeED3rfStxPBKSHGsob\n\tJQREFZQUqexlrl0NkznOuXrrwZwKs+1EXRR8CaIM=","Date":"Mon, 14 Dec 2020 15:47:39 +0200","From":"Laurent Pinchart ","To":"paul.elder@ideasonboard.com","Message-ID":"","References":"<20201212185116.29611-1-laurent.pinchart@ideasonboard.com>\n\t<20201212185116.29611-4-laurent.pinchart@ideasonboard.com>\n\t<20201214022051.GB2095@pyrite.rasen.tech>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201214022051.GB2095@pyrite.rasen.tech>","Subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: Manage\n\tresources with std::unique_ptr<>","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14247,"web_url":"https://patchwork.libcamera.org/comment/14247/","msgid":"<20201215041014.GE2095@pyrite.rasen.tech>","date":"2020-12-15T04:10:14","subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: Manage\n\tresources with std::unique_ptr<>","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Mon, Dec 14, 2020 at 03:47:39PM +0200, Laurent Pinchart wrote:\n> Hi Paul,\n> \n> On Mon, Dec 14, 2020 at 11:20:51AM +0900, paul.elder@ideasonboard.com wrote:\n> > On Sat, Dec 12, 2020 at 08:51:16PM +0200, Laurent Pinchart wrote:\n> > > Replace manual resource destruction with std::unique_ptr<> where\n> > > applicable. This removes the need for several destructors.\n> > > \n> > > Signed-off-by: Laurent Pinchart \n> > > ---\n> > > src/libcamera/pipeline/ipu3/cio2.cpp | 11 ++---------\n> > > src/libcamera/pipeline/ipu3/cio2.h | 9 ++++-----\n> > > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 19 +++++++------------\n> > > src/libcamera/pipeline/simple/converter.cpp | 8 +-------\n> > > src/libcamera/pipeline/simple/converter.h | 3 +--\n> > > src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 12 ++++--------\n> > > src/libcamera/pipeline/vimc/vimc.cpp | 11 +++--------\n> > > 7 files changed, 22 insertions(+), 51 deletions(-)\n> > > \n> > > diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> > > index 821715e325b4..bd5260d5b288 100644\n> > > --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> > > +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> > > @@ -33,16 +33,9 @@ const std::map mbusCodesToPixelFormat = {\n> > > } /* namespace */\n> > > \n> > > CIO2Device::CIO2Device()\n> > > -\t: sensor_(nullptr), csi2_(nullptr)\n> > > {\n> > > }\n> > > \n> > > -CIO2Device::~CIO2Device()\n> > > -{\n> > > -\tdelete csi2_;\n> > > -\tdelete sensor_;\n> > > -}\n> > > -\n> > > /**\n> > > * \\brief Retrieve the list of supported PixelFormats\n> > > *\n> > > @@ -117,7 +110,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> > > \n> > > \tMediaLink *link = links[0];\n> > > \tMediaEntity *sensorEntity = link->source()->entity();\n> > > -\tsensor_ = new CameraSensor(sensorEntity);\n> > > +\tsensor_ = std::make_unique(sensorEntity);\n> > > \tret = sensor_->init();\n> > > \tif (ret)\n> > > \t\treturn ret;\n> > > @@ -148,7 +141,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n> > > \t * might impact on power consumption.\n> > > \t */\n> > > \n> > > -\tcsi2_ = new V4L2Subdevice(csi2Entity);\n> > > +\tcsi2_ = std::make_unique(csi2Entity);\n> > > \tret = csi2_->open();\n> > > \tif (ret)\n> > > \t\treturn ret;\n> > > diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\n> > > index 0dca9673ca07..236ad287354a 100644\n> > > --- a/src/libcamera/pipeline/ipu3/cio2.h\n> > > +++ b/src/libcamera/pipeline/ipu3/cio2.h\n> > > @@ -33,7 +33,6 @@ public:\n> > > \tstatic constexpr unsigned int CIO2_BUFFER_COUNT = 4;\n> > > \n> > > \tCIO2Device();\n> > > -\t~CIO2Device();\n> > > \n> > > \tstd::vector formats() const;\n> > > \tstd::vector sizes() const;\n> > > @@ -49,8 +48,8 @@ public:\n> > > \tint start();\n> > > \tint stop();\n> > > \n> > > -\tCameraSensor *sensor() { return sensor_; }\n> > > -\tconst CameraSensor *sensor() const { return sensor_; }\n> > > +\tCameraSensor *sensor() { return sensor_.get(); }\n> > > +\tconst CameraSensor *sensor() const { return sensor_.get(); }\n> > > \n> > > \tint queueBuffer(Request *request, FrameBuffer *rawBuffer);\n> > > \tvoid tryReturnBuffer(FrameBuffer *buffer);\n> > > @@ -61,8 +60,8 @@ private:\n> > > \n> > > \tvoid cio2BufferReady(FrameBuffer *buffer);\n> > > \n> > > -\tCameraSensor *sensor_;\n> > > -\tV4L2Subdevice *csi2_;\n> > > +\tstd::unique_ptr sensor_;\n> > > +\tstd::unique_ptr csi2_;\n> > > \tstd::unique_ptr output_;\n> > > \n> > > \tstd::vector> buffers_;\n> > > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > > index 4d98c9027f42..021d0ffe3ffb 100644\n> > > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > > @@ -121,21 +121,16 @@ class RkISP1CameraData : public CameraData\n> > > public:\n> > > \tRkISP1CameraData(PipelineHandler *pipe, RkISP1MainPath *mainPath,\n> > > \t\t\t RkISP1SelfPath *selfPath)\n> > > -\t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n> > > -\t\t frameInfo_(pipe), mainPath_(mainPath), selfPath_(selfPath)\n> > > +\t\t: CameraData(pipe), frame_(0), frameInfo_(pipe),\n> > > +\t\t mainPath_(mainPath), selfPath_(selfPath)\n> > > \t{\n> > > \t}\n> > > \n> > > -\t~RkISP1CameraData()\n> > > -\t{\n> > > -\t\tdelete sensor_;\n> > > -\t}\n> > > -\n> > > \tint loadIPA();\n> > > \n> > > \tStream mainPathStream_;\n> > > \tStream selfPathStream_;\n> > > -\tCameraSensor *sensor_;\n> > > +\tstd::unique_ptr sensor_;\n> > > \tunsigned int frame_;\n> > > \tstd::vector ipaBuffers_;\n> > > \tRkISP1Frames frameInfo_;\n> > > @@ -430,7 +425,7 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,\n> > > \tcase RKISP1_IPA_ACTION_V4L2_SET: {\n> > > \t\tconst ControlList &controls = action.controls[0];\n> > > \t\ttimeline_.scheduleAction(std::make_unique(frame,\n> > > -\t\t\t\t\t\t\t\t\t\t sensor_,\n> > > +\t\t\t\t\t\t\t\t\t\t sensor_.get(),\n> > > \t\t\t\t\t\t\t\t\t\t controls));\n> > > \t\tbreak;\n> > > \t}\n> > > @@ -489,7 +484,7 @@ bool RkISP1CameraConfiguration::fitsAllPaths(const StreamConfiguration &cfg)\n> > > \n> > > CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> > > {\n> > > -\tconst CameraSensor *sensor = data_->sensor_;\n> > > +\tconst CameraSensor *sensor = data_->sensor_.get();\n> > > \tStatus status = Valid;\n> > \n> > What's wrong with using the unique_ptr here directly?\n> \n> Nothing as such. We could s/sensor/data_->sensor_/ in the function. The\n> local sensor variable is just a shorthand. We could also write\n> \n> \tconst std::unique_ptr &sensor = data_->sensor_;\n> \n> but that seems a bit more complicated. Would you prefer that ?\n\nAh yeah, true. Nah, what you have is fine.\n\n\nPaul\n\n> > Just wondering though, so\n> > \n> > Reviewed-by: Paul Elder \n> > \n> > > \tif (config_.empty())\n> > > @@ -660,7 +655,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> > > \tRkISP1CameraConfiguration *config =\n> > > \t\tstatic_cast(c);\n> > > \tRkISP1CameraData *data = cameraData(camera);\n> > > -\tCameraSensor *sensor = data->sensor_;\n> > > +\tCameraSensor *sensor = data->sensor_.get();\n> > > \tint ret;\n> > > \n> > > \tret = initLinks(camera, sensor, *config);\n> > > @@ -1035,7 +1030,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n> > > \n> > > \tdata->controlInfo_ = std::move(ctrls);\n> > > \n> > > -\tdata->sensor_ = new CameraSensor(sensor);\n> > > +\tdata->sensor_ = std::make_unique(sensor);\n> > > \tret = data->sensor_->init();\n> > > \tif (ret)\n> > > \t\treturn ret;\n> > > diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> > > index 67e6e864aa0a..a6a8e139cb3e 100644\n> > > --- a/src/libcamera/pipeline/simple/converter.cpp\n> > > +++ b/src/libcamera/pipeline/simple/converter.cpp\n> > > @@ -24,7 +24,6 @@ namespace libcamera {\n> > > LOG_DECLARE_CATEGORY(SimplePipeline)\n> > > \n> > > SimpleConverter::SimpleConverter(MediaDevice *media)\n> > > -\t: m2m_(nullptr)\n> > > {\n> > > \t/*\n> > > \t * Locate the video node. There's no need to validate the pipeline\n> > > @@ -38,17 +37,12 @@ SimpleConverter::SimpleConverter(MediaDevice *media)\n> > > \tif (it == entities.end())\n> > > \t\treturn;\n> > > \n> > > -\tm2m_ = new V4L2M2MDevice((*it)->deviceNode());\n> > > +\tm2m_ = std::make_unique((*it)->deviceNode());\n> > > \n> > > \tm2m_->output()->bufferReady.connect(this, &SimpleConverter::outputBufferReady);\n> > > \tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::captureBufferReady);\n> > > }\n> > > \n> > > -SimpleConverter::~SimpleConverter()\n> > > -{\n> > > -\tdelete m2m_;\n> > > -}\n> > > -\n> > > int SimpleConverter::open()\n> > > {\n> > > \tif (!m2m_)\n> > > diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\n> > > index 78296680aa14..a3c4d899cfc8 100644\n> > > --- a/src/libcamera/pipeline/simple/converter.h\n> > > +++ b/src/libcamera/pipeline/simple/converter.h\n> > > @@ -29,7 +29,6 @@ class SimpleConverter\n> > > {\n> > > public:\n> > > \tSimpleConverter(MediaDevice *media);\n> > > -\t~SimpleConverter();\n> > > \n> > > \tint open();\n> > > \tvoid close();\n> > > @@ -56,7 +55,7 @@ private:\n> > > \tvoid captureBufferReady(FrameBuffer *buffer);\n> > > \tvoid outputBufferReady(FrameBuffer *buffer);\n> > > \n> > > -\tV4L2M2MDevice *m2m_;\n> > > +\tstd::unique_ptr m2m_;\n> > > \n> > > \tstd::queue captureDoneQueue_;\n> > > \tstd::queue outputDoneQueue_;\n> > > diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> > > index 87b0f03d143a..e54f45bb8825 100644\n> > > --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> > > +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> > > @@ -9,6 +9,7 @@\n> > > #include \n> > > #include \n> > > #include \n> > > +#include \n> > > #include \n> > > \n> > > #include \n> > > @@ -35,21 +36,16 @@ class UVCCameraData : public CameraData\n> > > {\n> > > public:\n> > > \tUVCCameraData(PipelineHandler *pipe)\n> > > -\t\t: CameraData(pipe), video_(nullptr)\n> > > +\t\t: CameraData(pipe)\n> > > \t{\n> > > \t}\n> > > \n> > > -\t~UVCCameraData()\n> > > -\t{\n> > > -\t\tdelete video_;\n> > > -\t}\n> > > -\n> > > \tint init(MediaDevice *media);\n> > > \tvoid addControl(uint32_t cid, const ControlInfo &v4l2info,\n> > > \t\t\tControlInfoMap::Map *ctrls);\n> > > \tvoid bufferReady(FrameBuffer *buffer);\n> > > \n> > > -\tV4L2VideoDevice *video_;\n> > > +\tstd::unique_ptr video_;\n> > > \tStream stream_;\n> > > };\n> > > \n> > > @@ -499,7 +495,7 @@ int UVCCameraData::init(MediaDevice *media)\n> > > \t}\n> > > \n> > > \t/* Create and open the video device. */\n> > > -\tvideo_ = new V4L2VideoDevice(*entity);\n> > > +\tvideo_ = std::make_unique(*entity);\n> > > \tret = video_->open();\n> > > \tif (ret)\n> > > \t\treturn ret;\n> > > diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> > > index 72256f5b4190..8bda746f3136 100644\n> > > --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> > > +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> > > @@ -42,20 +42,15 @@ class VimcCameraData : public CameraData\n> > > {\n> > > public:\n> > > \tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n> > > -\t\t: CameraData(pipe), media_(media), sensor_(nullptr)\n> > > +\t\t: CameraData(pipe), media_(media)\n> > > \t{\n> > > \t}\n> > > \n> > > -\t~VimcCameraData()\n> > > -\t{\n> > > -\t\tdelete sensor_;\n> > > -\t}\n> > > -\n> > > \tint init();\n> > > \tvoid bufferReady(FrameBuffer *buffer);\n> > > \n> > > \tMediaDevice *media_;\n> > > -\tCameraSensor *sensor_;\n> > > +\tstd::unique_ptr sensor_;\n> > > \tstd::unique_ptr debayer_;\n> > > \tstd::unique_ptr scaler_;\n> > > \tstd::unique_ptr video_;\n> > > @@ -461,7 +456,7 @@ int VimcCameraData::init()\n> > > \t\treturn ret;\n> > > \n> > > \t/* Create and open the camera sensor, debayer, scaler and video device. */\n> > > -\tsensor_ = new CameraSensor(media_->getEntityByName(\"Sensor B\"));\n> > > +\tsensor_ = std::make_unique(media_->getEntityByName(\"Sensor B\"));\n> > > \tret = sensor_->init();\n> > > \tif (ret)\n> > > \t\treturn ret;\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","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 399F6BD80A\n\tfor ;\n\tTue, 15 Dec 2020 04:10:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B1E0B61589;\n\tTue, 15 Dec 2020 05:10:24 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7D4CB6052C\n\tfor ;\n\tTue, 15 Dec 2020 05:10:22 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2B55B96;\n\tTue, 15 Dec 2020 05:10:19 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"dS8Xo2t2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1608005421;\n\tbh=DAeUqk0CYvPHV81J/KUbA646v1vndaFKUU0h85zE/6Q=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dS8Xo2t2QxggdN7bss1wtl5Yehh6JiTfJK55VdQ9Lx0JCQyizXXlBvrHGL4pOEg8/\n\tdJTm7hNG1oCMdGQ//p2z5AQEHevc7pR5PFQjLVtSlCDJ7nR11ygBIHVHY9+qessSL8\n\tUE61485XR0HkPptFq+1okC9gzFDc0vLq5fB9d8U8=","Date":"Tue, 15 Dec 2020 13:10:14 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20201215041014.GE2095@pyrite.rasen.tech>","References":"<20201212185116.29611-1-laurent.pinchart@ideasonboard.com>\n\t<20201212185116.29611-4-laurent.pinchart@ideasonboard.com>\n\t<20201214022051.GB2095@pyrite.rasen.tech>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH 3/3] libcamera: pipeline: Manage\n\tresources with std::unique_ptr<>","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]