[{"id":12978,"web_url":"https://patchwork.libcamera.org/comment/12978/","msgid":"<20201005122511.GK3931@pendragon.ideasonboard.com>","date":"2020-10-05T12:25:11","subject":"Re: [libcamera-devel] [PATCH 09/15] android: camera_stream: Add\n\tFrameBufferAllocator","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Mon, Oct 05, 2020 at 01:46:43PM +0300, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Add a FrameBufferAllocator class member to the CameraStream class.\n> The allocator is constructed for CameraStream instances that needs\n> internal allocation and deleted at class destruction time.\n> \n> The definition of a destructor for the class deletes the implicitly\n> defined copy constructor, required as the CameraDevice stores\n> CameraStream instances in a pre-reserved vector. In order to make the\n> CameraStream copy-constructable it is required to make the encoder_\n> pointer decay to a raw pointer, as unique_ptr<> are not\n> copy-constructable.\n\nHow about defining a move constructor instead ? That's all that\nstd::vector<> should need if I'm not mistaken.\n\n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_stream.cpp | 13 +++++++++++--\n> src/android/camera_stream.h | 6 +++++-\n> 2 files changed, 16 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 6e7419ae31b8..9f3e7026b1a4 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -19,12 +19,21 @@ LOG_DECLARE_CATEGORY(HAL);\n> CameraStream::CameraStream(CameraDevice *cameraDev, Type type,\n> \t\t\t camera3_stream_t *androidStream, unsigned int index)\n> \t: cameraDevice_(cameraDev), type_(type), androidStream_(androidStream),\n> -\t index_(index), encoder_(nullptr)\n> +\t index_(index), encoder_(nullptr), allocator_(nullptr)\n> {\n> \tconfig_ = cameraDevice_->cameraConfiguration();\n> \n> \tif (type_ == Type::Internal || type_ == Type::Mapped)\n> -\t\tencoder_.reset(new EncoderLibJpeg);\n> +\t\tencoder_ = new EncoderLibJpeg();\n> +\n> +\tif (type == Type::Internal)\n> +\t\tallocator_ = new FrameBufferAllocator(cameraDevice_->camera());\n> +}\n> +\n> +CameraStream::~CameraStream()\n> +{\n> +\tdelete encoder_;\n> +\tdelete allocator_;\n> }\n> \n> const StreamConfiguration &CameraStream::streamConfiguration() const\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index b67b4c0ca0b3..eaf4357ed096 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -13,6 +13,7 @@\n> \n> #include \n> #include \n> +#include \n> #include \n> #include \n> \n> @@ -109,6 +110,8 @@ public:\n> \t};\n> \tCameraStream(CameraDevice *cameraDev, Type type,\n> \t\t camera3_stream_t *androidStream, unsigned int index);\n> +\tCameraStream(const CameraStream &) = default;\n> +\t~CameraStream();\n\nIf you declare a copy constructor, you should also declare a copy\nassignement operator (but as stated above I think you need the move\nconstructor and assignment operators instead).\n\n> \n> \tint outputFormat() const { return androidStream_->format; }\n> \tType type() const { return type_; }\n> @@ -135,7 +138,8 @@ private:\n> \t */\n> \tunsigned int index_;\n> \tlibcamera::CameraConfiguration *config_;\n> -\tstd::unique_ptr encoder_;\n> +\tEncoder *encoder_;\n> +\tlibcamera::FrameBufferAllocator *allocator_;\n> };\n> \n> #endif /* __ANDROID_CAMERA_STREAM__ */","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 6A1E7C3B5D\n\tfor ;\n\tMon, 5 Oct 2020 12:25:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D131D63C13;\n\tMon, 5 Oct 2020 14:25:52 +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 544EE63BD5\n\tfor ;\n\tMon, 5 Oct 2020 14:25:51 +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 B2BEC3B\n\tfor ;\n\tMon, 5 Oct 2020 14:25:50 +0200 (CEST)"],"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=\"ZWDwAxuU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601900750;\n\tbh=n/JMW+4qa2Hoxy0Mrsg9oQmzeFoF3jrqtfSYWlF8Jcg=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=ZWDwAxuU3dGsLUhQVUenMdrnkfSsT9Fy7NZdwSQqFg5bGWcbqyVLmqhFdvPHJsue/\n\tWwwzzAzfIKGvxTbjgwjVZUWuLFq9AtfmHr5E4j3jbK+t/fh01UoJ34LIO/tTNfA2r9\n\tnVh6ZYnEKUc7Qr8851y4nl39fLBsbCfq0UjE4IV8=","Date":"Mon, 5 Oct 2020 15:25:11 +0300","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20201005122511.GK3931@pendragon.ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-10-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005104649.10812-10-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 09/15] android: camera_stream: Add\n\tFrameBufferAllocator","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":13003,"web_url":"https://patchwork.libcamera.org/comment/13003/","msgid":"","date":"2020-10-06T10:35:46","subject":"Re: [libcamera-devel] [PATCH 09/15] android: camera_stream: Add\n\tFrameBufferAllocator","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo\n\nOn 05/10/2020 13:25, Laurent Pinchart wrote:\n> Hi Jacopo,\n> \n> Thank you for the patch.\n> \n> On Mon, Oct 05, 2020 at 01:46:43PM +0300, Laurent Pinchart wrote:\n>> From: Jacopo Mondi \n>>\n>> Add a FrameBufferAllocator class member to the CameraStream class.\n>> The allocator is constructed for CameraStream instances that needs\n>> internal allocation and deleted at class destruction time.\n>>\n>> The definition of a destructor for the class deletes the implicitly\n>> defined copy constructor, required as the CameraDevice stores\n>> CameraStream instances in a pre-reserved vector. In order to make the\n>> CameraStream copy-constructable it is required to make the encoder_\n>> pointer decay to a raw pointer, as unique_ptr<> are not\n>> copy-constructable.\n> \n> How about defining a move constructor instead ? That's all that\n> std::vector<> should need if I'm not mistaken.\n\n\nIf that's all it needs that sounds like a better route indeed.\n\n--\nKB\n\n>> Signed-off-by: Jacopo Mondi \n>> ---\n>> src/android/camera_stream.cpp | 13 +++++++++++--\n>> src/android/camera_stream.h | 6 +++++-\n>> 2 files changed, 16 insertions(+), 3 deletions(-)\n>>\n>> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n>> index 6e7419ae31b8..9f3e7026b1a4 100644\n>> --- a/src/android/camera_stream.cpp\n>> +++ b/src/android/camera_stream.cpp\n>> @@ -19,12 +19,21 @@ LOG_DECLARE_CATEGORY(HAL);\n>> CameraStream::CameraStream(CameraDevice *cameraDev, Type type,\n>> \t\t\t camera3_stream_t *androidStream, unsigned int index)\n>> \t: cameraDevice_(cameraDev), type_(type), androidStream_(androidStream),\n>> -\t index_(index), encoder_(nullptr)\n>> +\t index_(index), encoder_(nullptr), allocator_(nullptr)\n>> {\n>> \tconfig_ = cameraDevice_->cameraConfiguration();\n>> \n>> \tif (type_ == Type::Internal || type_ == Type::Mapped)\n>> -\t\tencoder_.reset(new EncoderLibJpeg);\n>> +\t\tencoder_ = new EncoderLibJpeg();\n>> +\n>> +\tif (type == Type::Internal)\n>> +\t\tallocator_ = new FrameBufferAllocator(cameraDevice_->camera());\n>> +}\n>> +\n>> +CameraStream::~CameraStream()\n>> +{\n>> +\tdelete encoder_;\n>> +\tdelete allocator_;\n>> }\n>> \n>> const StreamConfiguration &CameraStream::streamConfiguration() const\n>> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n>> index b67b4c0ca0b3..eaf4357ed096 100644\n>> --- a/src/android/camera_stream.h\n>> +++ b/src/android/camera_stream.h\n>> @@ -13,6 +13,7 @@\n>> \n>> #include \n>> #include \n>> +#include \n>> #include \n>> #include \n>> \n>> @@ -109,6 +110,8 @@ public:\n>> \t};\n>> \tCameraStream(CameraDevice *cameraDev, Type type,\n>> \t\t camera3_stream_t *androidStream, unsigned int index);\n>> +\tCameraStream(const CameraStream &) = default;\n>> +\t~CameraStream();\n> \n> If you declare a copy constructor, you should also declare a copy\n> assignement operator (but as stated above I think you need the move\n> constructor and assignment operators instead).\n> \n>> \n>> \tint outputFormat() const { return androidStream_->format; }\n>> \tType type() const { return type_; }\n>> @@ -135,7 +138,8 @@ private:\n>> \t */\n>> \tunsigned int index_;\n>> \tlibcamera::CameraConfiguration *config_;\n>> -\tstd::unique_ptr encoder_;\n>> +\tEncoder *encoder_;\n>> +\tlibcamera::FrameBufferAllocator *allocator_;\n>> };\n>> \n>> #endif /* __ANDROID_CAMERA_STREAM__ */\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 4778EBEEDF\n\tfor ;\n\tTue, 6 Oct 2020 10:35:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C7DDA63BFE;\n\tTue, 6 Oct 2020 12:35:50 +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 CF0E76035D\n\tfor ;\n\tTue, 6 Oct 2020 12:35:49 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 386BE3B;\n\tTue, 6 Oct 2020 12:35:49 +0200 (CEST)"],"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=\"SMuC2O0l\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601980549;\n\tbh=GNBrKvOZiGV9AFhcVVONCw4YK9p2opt/PDYC4YJ2VP0=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=SMuC2O0lfhUxCo3QW2bVgos27gC0BwOz2KK4i+QOlo4Fx2a1fSIzsgvbNcqkPHaLB\n\tiFecq27koh0LCo+xQK8k1yBBEAdLiytJw+f2RNdTug5bMFbrtnxLAJgjJuP3Y1l3Hg\n\t3A4s55bgWRYghu3ogg8vuHZPKPMVT9K8FIP3Wwmg=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-10-laurent.pinchart@ideasonboard.com>\n\t<20201005122511.GK3931@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Tue, 6 Oct 2020 11:35:46 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201005122511.GK3931@pendragon.ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 09/15] android: camera_stream: Add\n\tFrameBufferAllocator","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":13006,"web_url":"https://patchwork.libcamera.org/comment/13006/","msgid":"<20201006111959.niih6ebjdjmyvzta@uno.localdomain>","date":"2020-10-06T11:19:59","subject":"Re: [libcamera-devel] [PATCH 09/15] android: camera_stream: Add\n\tFrameBufferAllocator","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran, Laurent,\n\nOn Tue, Oct 06, 2020 at 11:35:46AM +0100, Kieran Bingham wrote:\n> Hi Jacopo\n>\n> On 05/10/2020 13:25, Laurent Pinchart wrote:\n> > Hi Jacopo,\n> >\n> > Thank you for the patch.\n> >\n> > On Mon, Oct 05, 2020 at 01:46:43PM +0300, Laurent Pinchart wrote:\n> >> From: Jacopo Mondi \n> >>\n> >> Add a FrameBufferAllocator class member to the CameraStream class.\n> >> The allocator is constructed for CameraStream instances that needs\n> >> internal allocation and deleted at class destruction time.\n> >>\n> >> The definition of a destructor for the class deletes the implicitly\n> >> defined copy constructor, required as the CameraDevice stores\n> >> CameraStream instances in a pre-reserved vector. In order to make the\n> >> CameraStream copy-constructable it is required to make the encoder_\n> >> pointer decay to a raw pointer, as unique_ptr<> are not\n> >> copy-constructable.\n> >\n> > How about defining a move constructor instead ? That's all that\n> > std::vector<> should need if I'm not mistaken.\n>\n>\n> If that's all it needs that sounds like a better route indeed.\n>\n\nEven better, if I use unique_ptr for every field (encoder_,\nallocator_, mutex_) I don't need a custom destructor, so the\nconstructor implicitly generated by the compiler stays valid and I\ndon't need to force it.\n\nThanks\n j\n\n> --\n> KB\n>\n> >> Signed-off-by: Jacopo Mondi \n> >> ---\n> >> src/android/camera_stream.cpp | 13 +++++++++++--\n> >> src/android/camera_stream.h | 6 +++++-\n> >> 2 files changed, 16 insertions(+), 3 deletions(-)\n> >>\n> >> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> >> index 6e7419ae31b8..9f3e7026b1a4 100644\n> >> --- a/src/android/camera_stream.cpp\n> >> +++ b/src/android/camera_stream.cpp\n> >> @@ -19,12 +19,21 @@ LOG_DECLARE_CATEGORY(HAL);\n> >> CameraStream::CameraStream(CameraDevice *cameraDev, Type type,\n> >> \t\t\t camera3_stream_t *androidStream, unsigned int index)\n> >> \t: cameraDevice_(cameraDev), type_(type), androidStream_(androidStream),\n> >> -\t index_(index), encoder_(nullptr)\n> >> +\t index_(index), encoder_(nullptr), allocator_(nullptr)\n> >> {\n> >> \tconfig_ = cameraDevice_->cameraConfiguration();\n> >>\n> >> \tif (type_ == Type::Internal || type_ == Type::Mapped)\n> >> -\t\tencoder_.reset(new EncoderLibJpeg);\n> >> +\t\tencoder_ = new EncoderLibJpeg();\n> >> +\n> >> +\tif (type == Type::Internal)\n> >> +\t\tallocator_ = new FrameBufferAllocator(cameraDevice_->camera());\n> >> +}\n> >> +\n> >> +CameraStream::~CameraStream()\n> >> +{\n> >> +\tdelete encoder_;\n> >> +\tdelete allocator_;\n> >> }\n> >>\n> >> const StreamConfiguration &CameraStream::streamConfiguration() const\n> >> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> >> index b67b4c0ca0b3..eaf4357ed096 100644\n> >> --- a/src/android/camera_stream.h\n> >> +++ b/src/android/camera_stream.h\n> >> @@ -13,6 +13,7 @@\n> >>\n> >> #include \n> >> #include \n> >> +#include \n> >> #include \n> >> #include \n> >>\n> >> @@ -109,6 +110,8 @@ public:\n> >> \t};\n> >> \tCameraStream(CameraDevice *cameraDev, Type type,\n> >> \t\t camera3_stream_t *androidStream, unsigned int index);\n> >> +\tCameraStream(const CameraStream &) = default;\n> >> +\t~CameraStream();\n> >\n> > If you declare a copy constructor, you should also declare a copy\n> > assignement operator (but as stated above I think you need the move\n> > constructor and assignment operators instead).\n> >\n> >>\n> >> \tint outputFormat() const { return androidStream_->format; }\n> >> \tType type() const { return type_; }\n> >> @@ -135,7 +138,8 @@ private:\n> >> \t */\n> >> \tunsigned int index_;\n> >> \tlibcamera::CameraConfiguration *config_;\n> >> -\tstd::unique_ptr encoder_;\n> >> +\tEncoder *encoder_;\n> >> +\tlibcamera::FrameBufferAllocator *allocator_;\n> >> };\n> >>\n> >> #endif /* __ANDROID_CAMERA_STREAM__ */\n> >\n>\n> --\n> Regards\n> --\n> Kieran\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 365A8BEEDF\n\tfor ;\n\tTue, 6 Oct 2020 11:16:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BC87863BFE;\n\tTue, 6 Oct 2020 13:16:01 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 678D96035D\n\tfor ;\n\tTue, 6 Oct 2020 13:16:00 +0200 (CEST)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id C1D5824000B;\n\tTue, 6 Oct 2020 11:15:59 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Tue, 6 Oct 2020 13:19:59 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20201006111959.niih6ebjdjmyvzta@uno.localdomain>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-10-laurent.pinchart@ideasonboard.com>\n\t<20201005122511.GK3931@pendragon.ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH 09/15] android: camera_stream: Add\n\tFrameBufferAllocator","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\" "}}]