[{"id":2615,"web_url":"https://patchwork.libcamera.org/comment/2615/","msgid":"<20190905075811.q3vlex7rd5w6crfh@uno.localdomain>","date":"2019-09-05T07:58:11","subject":"Re: [libcamera-devel] [PATCH v6 6/9] android: Add CameraMetadata\n\thelper class","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n thanks for addressing this\n\nOn Thu, Sep 05, 2019 at 09:47:33AM +0200, Jacopo Mondi wrote:\n> From: Laurent Pinchart \n>\n> The new CameraMetadata helper class wraps the Android camera_metadata_t\n> to simplify its usage.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/android/camera_metadata.cpp | 63 +++++++++++++++++++++++++++++++++\n> src/android/camera_metadata.h | 31 ++++++++++++++++\n> src/android/meson.build | 1 +\n> 3 files changed, 95 insertions(+)\n> create mode 100644 src/android/camera_metadata.cpp\n> create mode 100644 src/android/camera_metadata.h\n>\n> diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp\n> new file mode 100644\n> index 000000000000..c261e1f01a20\n> --- /dev/null\n> +++ b/src/android/camera_metadata.cpp\n> @@ -0,0 +1,63 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * camera_metadata.cpp - libcamera Android Camera Metadata Helper\n> + */\n> +\n> +#include \"camera_metadata.h\"\n> +\n> +#include \"log.h\"\n> +\n> +using namespace libcamera;\n> +\n> +LOG_DEFINE_CATEGORY(CameraMetadata);\n> +\n> +CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity)\n> +{\n> +\tmetadata_ = allocate_camera_metadata(entryCapacity, dataCapacity);\n> +\tvalid_ = metadata_ != nullptr;\n> +}\n> +\n> +CameraMetadata::~CameraMetadata()\n> +{\n> +\tif (metadata_)\n> +\t\tfree_camera_metadata(metadata_);\n> +}\n> +\n> +bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count)\n> +{\n> +\tif (!valid_)\n> +\t\treturn false;\n> +\n> +\tif (!add_camera_metadata_entry(metadata_, tag, data, count))\n> +\t\treturn true;\n> +\n> +\tconst char *name = get_camera_metadata_tag_name(tag);\n> +\tif (name)\n> +\t\tLOG(CameraMetadata, Error)\n> +\t\t\t<< \"Failed to add tag \" << name;\n> +\telse\n> +\t\tLOG(CameraMetadata, Error)\n> +\t\t\t<< \"Failed to add unknown tag \" << tag;\n> +\n> +\tvalid_ = false;\n> +\n> +\treturn false;\n> +}\n> +\n> +camera_metadata_t *CameraMetadata::get()\n> +{\n> +\treturn valid_ ? metadata_ : nullptr;\n> +}\n> +\n> +camera_metadata_t *CameraMetadata::release()\n> +{\n> +\tif (!valid_)\n> +\t\treturn nullptr;\n> +\n> +\tcamera_metadata_t *metadata = metadata_;\n> +\tvalid_ = false;\n> +\tmetadata_ = nullptr;\n> +\treturn metadata;\n> +}\n\nI would remove this operation as it is unused.\n\nOtherwise\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\n> new file mode 100644\n> index 000000000000..43a5598c6463\n> --- /dev/null\n> +++ b/src/android/camera_metadata.h\n> @@ -0,0 +1,31 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * camera_metadata.h - libcamera Android Camera Metadata Helper\n> + */\n> +#ifndef __ANDROID_CAMERA_METADATA_H__\n> +#define __ANDROID_CAMERA_METADATA_H__\n> +\n> +#include \n> +\n> +#include \n> +\n> +class CameraMetadata\n> +{\n> +public:\n> +\tCameraMetadata(size_t entryCapacity, size_t dataCapacity);\n> +\t~CameraMetadata();\n> +\n> +\tbool isValid() { return valid_; }\n> +\tbool addEntry(uint32_t tag, const void *data, size_t data_count);\n> +\n> +\tcamera_metadata_t *get();\n> +\tcamera_metadata_t *release();\n> +\n> +private:\n> +\tcamera_metadata_t *metadata_;\n> +\tbool valid_;\n> +};\n> +\n> +#endif /* __ANDROID_CAMERA_METADATA_H__ */\n> diff --git a/src/android/meson.build b/src/android/meson.build\n> index 26537794bc29..b5e4eeeb73a8 100644\n> --- a/src/android/meson.build\n> +++ b/src/android/meson.build\n> @@ -2,6 +2,7 @@ android_hal_sources = files([\n> 'camera3_hal.cpp',\n> 'camera_hal_manager.cpp',\n> 'camera_device.cpp',\n> + 'camera_metadata.cpp',\n> 'camera_proxy.cpp',\n> 'thread_rpc.cpp'\n> ])\n> --\n> 2.23.0\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9353D60BD9\n\tfor ;\n\tThu, 5 Sep 2019 09:56:38 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 2FD50FF80D\n\tfor ;\n\tThu, 5 Sep 2019 07:56:37 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Thu, 5 Sep 2019 09:58:11 +0200","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190905075811.q3vlex7rd5w6crfh@uno.localdomain>","References":"<20190905074737.6955-1-jacopo@jmondi.org>\n\t<20190905074737.6955-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"f4ketroonpiljuds\"","Content-Disposition":"inline","In-Reply-To":"<20190905074737.6955-7-jacopo@jmondi.org>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH v6 6/9] android: Add CameraMetadata\n\thelper class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 05 Sep 2019 07:56:38 -0000"}},{"id":2618,"web_url":"https://patchwork.libcamera.org/comment/2618/","msgid":"<20190905093734.GB5035@pendragon.ideasonboard.com>","date":"2019-09-05T09:37:34","subject":"Re: [libcamera-devel] [PATCH v6 6/9] android: Add CameraMetadata\n\thelper class","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Thu, Sep 05, 2019 at 09:58:11AM +0200, Jacopo Mondi wrote:\n> On Thu, Sep 05, 2019 at 09:47:33AM +0200, Jacopo Mondi wrote:\n> > From: Laurent Pinchart \n> >\n> > The new CameraMetadata helper class wraps the Android camera_metadata_t\n> > to simplify its usage.\n> >\n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > src/android/camera_metadata.cpp | 63 +++++++++++++++++++++++++++++++++\n> > src/android/camera_metadata.h | 31 ++++++++++++++++\n> > src/android/meson.build | 1 +\n> > 3 files changed, 95 insertions(+)\n> > create mode 100644 src/android/camera_metadata.cpp\n> > create mode 100644 src/android/camera_metadata.h\n> >\n> > diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp\n> > new file mode 100644\n> > index 000000000000..c261e1f01a20\n> > --- /dev/null\n> > +++ b/src/android/camera_metadata.cpp\n> > @@ -0,0 +1,63 @@\n> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +/*\n> > + * Copyright (C) 2019, Google Inc.\n> > + *\n> > + * camera_metadata.cpp - libcamera Android Camera Metadata Helper\n> > + */\n> > +\n> > +#include \"camera_metadata.h\"\n> > +\n> > +#include \"log.h\"\n> > +\n> > +using namespace libcamera;\n> > +\n> > +LOG_DEFINE_CATEGORY(CameraMetadata);\n> > +\n> > +CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity)\n> > +{\n> > +\tmetadata_ = allocate_camera_metadata(entryCapacity, dataCapacity);\n> > +\tvalid_ = metadata_ != nullptr;\n> > +}\n> > +\n> > +CameraMetadata::~CameraMetadata()\n> > +{\n> > +\tif (metadata_)\n> > +\t\tfree_camera_metadata(metadata_);\n> > +}\n> > +\n> > +bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count)\n> > +{\n> > +\tif (!valid_)\n> > +\t\treturn false;\n> > +\n> > +\tif (!add_camera_metadata_entry(metadata_, tag, data, count))\n> > +\t\treturn true;\n> > +\n> > +\tconst char *name = get_camera_metadata_tag_name(tag);\n> > +\tif (name)\n> > +\t\tLOG(CameraMetadata, Error)\n> > +\t\t\t<< \"Failed to add tag \" << name;\n> > +\telse\n> > +\t\tLOG(CameraMetadata, Error)\n> > +\t\t\t<< \"Failed to add unknown tag \" << tag;\n> > +\n> > +\tvalid_ = false;\n> > +\n> > +\treturn false;\n> > +}\n> > +\n> > +camera_metadata_t *CameraMetadata::get()\n> > +{\n> > +\treturn valid_ ? metadata_ : nullptr;\n> > +}\n> > +\n> > +camera_metadata_t *CameraMetadata::release()\n> > +{\n> > +\tif (!valid_)\n> > +\t\treturn nullptr;\n> > +\n> > +\tcamera_metadata_t *metadata = metadata_;\n> > +\tvalid_ = false;\n> > +\tmetadata_ = nullptr;\n> > +\treturn metadata;\n> > +}\n> \n> I would remove this operation as it is unused.\n\nIt was used in a previous version of the code, but not anymore. Feel\nfree to remove it.\n\n> Otherwise\n> Reviewed-by: Jacopo Mondi \n> \n> > diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\n> > new file mode 100644\n> > index 000000000000..43a5598c6463\n> > --- /dev/null\n> > +++ b/src/android/camera_metadata.h\n> > @@ -0,0 +1,31 @@\n> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +/*\n> > + * Copyright (C) 2019, Google Inc.\n> > + *\n> > + * camera_metadata.h - libcamera Android Camera Metadata Helper\n> > + */\n> > +#ifndef __ANDROID_CAMERA_METADATA_H__\n> > +#define __ANDROID_CAMERA_METADATA_H__\n> > +\n> > +#include \n> > +\n> > +#include \n> > +\n> > +class CameraMetadata\n> > +{\n> > +public:\n> > +\tCameraMetadata(size_t entryCapacity, size_t dataCapacity);\n> > +\t~CameraMetadata();\n> > +\n> > +\tbool isValid() { return valid_; }\n> > +\tbool addEntry(uint32_t tag, const void *data, size_t data_count);\n> > +\n> > +\tcamera_metadata_t *get();\n> > +\tcamera_metadata_t *release();\n> > +\n> > +private:\n> > +\tcamera_metadata_t *metadata_;\n> > +\tbool valid_;\n> > +};\n> > +\n> > +#endif /* __ANDROID_CAMERA_METADATA_H__ */\n> > diff --git a/src/android/meson.build b/src/android/meson.build\n> > index 26537794bc29..b5e4eeeb73a8 100644\n> > --- a/src/android/meson.build\n> > +++ b/src/android/meson.build\n> > @@ -2,6 +2,7 @@ android_hal_sources = files([\n> > 'camera3_hal.cpp',\n> > 'camera_hal_manager.cpp',\n> > 'camera_device.cpp',\n> > + 'camera_metadata.cpp',\n> > 'camera_proxy.cpp',\n> > 'thread_rpc.cpp'\n> > ])","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5D37560BD9\n\tfor ;\n\tThu, 5 Sep 2019 11:37:41 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E958C26D;\n\tThu, 5 Sep 2019 11:37:40 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1567676261;\n\tbh=6ycikIfVm964lJAb70hqyfqK+CJ9Ly8o4sEvMnRCB8Q=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=UMMjdqqz8ewsvXeSc4QPEQZHW1wa8D9xslRnuUYolxW77MLEWdu75BwUfLqUTIHFI\n\tpRKLyADjU+N3z2MCK0XHK3AATMX0CuY5rrkq2UUI7Bi8Qeg4A5v2r3MZmDQUayiCbp\n\tOPE3jpdAtl8Q434K7QP5YblzVbDR43Q72KNBzlQc=","Date":"Thu, 5 Sep 2019 12:37:34 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190905093734.GB5035@pendragon.ideasonboard.com>","References":"<20190905074737.6955-1-jacopo@jmondi.org>\n\t<20190905074737.6955-7-jacopo@jmondi.org>\n\t<20190905075811.q3vlex7rd5w6crfh@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190905075811.q3vlex7rd5w6crfh@uno.localdomain>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v6 6/9] android: Add CameraMetadata\n\thelper class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 05 Sep 2019 09:37:41 -0000"}}]