[{"id":1061,"web_url":"https://patchwork.libcamera.org/comment/1061/","msgid":"<5a29a205-4516-5ae4-b087-0d71ef7040ab@ideasonboard.com>","date":"2019-03-18T14:50:07","subject":"Re: [libcamera-devel] [PATCH v3 2/4] libcamera: formats: Define\n\tFormatEnum type","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 14/03/2019 15:51, Jacopo Mondi wrote:\n> Add an internal format.h and format.cpp files to collect libcamera image\n> format related types, helpers and structures. Define and document there\n\ns/there//\n\n> the FormatEnum type, used to enumerate pixel image formats and\n> associated image resolutions.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/libcamera/formats.cpp | 27 ++++++++++++++++++++++++++\n> src/libcamera/include/formats.h | 22 +++++++++++++++++++++\n> src/libcamera/include/v4l2_subdevice.h | 4 ++--\n> src/libcamera/meson.build | 1 +\n> src/libcamera/v4l2_subdevice.cpp | 5 ++---\n> 5 files changed, 54 insertions(+), 5 deletions(-)\n> create mode 100644 src/libcamera/formats.cpp\n> create mode 100644 src/libcamera/include/formats.h\n> \n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> new file mode 100644\n> index 000000000000..a6251fe91cec\n> --- /dev/null\n> +++ b/src/libcamera/formats.cpp\n> @@ -0,0 +1,27 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * formats.cpp - Libcamera image formats\n> + */\n> +\n> +#include \"formats.h\"\n> +\n> +/**\n> + * \\file formats.h\n> + * \\brief Types and helper methods to handle libcamera image formats\n> + */\n> +\n> +namespace libcamera {\n> +\n> +/**\n> + * \\typedef FormatEnum\n> + * \\brief Type definition for the map of image formats and sizes\n> + *\n> + * Type definition used to enumerate the supported pixel formats and image frame\n> + * sizes. The type associates in a map a pixel code, used to represent memory or\n> + * wire image formats, to a vector of image resolutions represented by SizeRange\n> + * items.\n> + */\n> +\n> +} /* namespace libcamera */\n> diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h\n> new file mode 100644\n> index 000000000000..5fcfb11318e7\n> --- /dev/null\n> +++ b/src/libcamera/include/formats.h\n> @@ -0,0 +1,22 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * formats.h - Libcamera image formats\n> + */\n> +\n> +#ifndef __LIBCAMERA_FORMATS_H__\n> +#define __LIBCAMERA_FORMATS_H__\n> +\n> +#include \n> +#include \n> +\n> +#include \"geometry.h\"\n> +\n> +namespace libcamera {\n> +\n> +typedef std::map> FormatEnum;\n> +\n> +} /* namespace libcamera */\n> +\n> +#endif /* __LIBCAMERA_FORMATS_H__ */\n> diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h\n> index 700e66bcddac..3ecf08514898 100644\n> --- a/src/libcamera/include/v4l2_subdevice.h\n> +++ b/src/libcamera/include/v4l2_subdevice.h\n> @@ -11,6 +11,7 @@\n> #include \n> #include \n> \n> +#include \"formats.h\"\n> #include \"geometry.h\"\n> #include \"log.h\"\n> #include \"media_object.h\"\n> @@ -42,8 +43,7 @@ public:\n> \tint setCrop(unsigned int pad, Rectangle *rect);\n> \tint setCompose(unsigned int pad, Rectangle *rect);\n> \n> -\tconst std::map>\n> -\t\t\t\t\t\tformats(unsigned int pad);\n> +\tFormatEnum formats(unsigned int pad);\n> \n> \tint getFormat(unsigned int pad, V4L2SubdeviceFormat *format);\n> \tint setFormat(unsigned int pad, V4L2SubdeviceFormat *format);\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 8384cd0af451..4433abfceca3 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -6,6 +6,7 @@ libcamera_sources = files([\n> 'event_dispatcher.cpp',\n> 'event_dispatcher_poll.cpp',\n> 'event_notifier.cpp',\n> + 'formats.cpp',\n> 'geometry.cpp',\n> 'log.cpp',\n> 'media_device.cpp',\n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index eb60fe42bb4e..caaf25ce1b36 100644\n> --- a/src/libcamera/v4l2_subdevice.cpp\n> +++ b/src/libcamera/v4l2_subdevice.cpp\n> @@ -210,10 +210,9 @@ int V4L2Subdevice::setCompose(unsigned int pad, Rectangle *rect)\n> * \\return A map of image formats associated with a list of image sizes, or\n> * an empty map on error or if the pad does not exist\n> */\n> -const std::map>\n> -V4L2Subdevice::formats(unsigned int pad)\n> +FormatEnum V4L2Subdevice::formats(unsigned int pad)\n> {\n> -\tstd::map> formatMap = {};\n> +\tFormatEnum formatMap = {};\n> \tstruct v4l2_subdev_mbus_code_enum mbusEnum = {};\n> \tint ret;\n> \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 11D33610B6\n\tfor ;\n\tMon, 18 Mar 2019 15:50:13 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6353833A;\n\tMon, 18 Mar 2019 15:50:13 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1552920613;\n\tbh=puRSeNusTY44JQAxgPnXvyX2C6cOPiX19IEXPgus754=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=Ihn1KZdQGRPe2bp2O+R+cfNPwNqdPP+stjm9nbKNPk2S71TAM2Slh+aKlpAOCLIqD\n\txG7Eyix6zyLmurGEVLyUV55o1ZJ5LmNEkqs5LKmN47SHK/Xy1nnZ/Nx7sIAUq9cTU+\n\tIMjRwA2JOceQQK0XvjLa0Fb3Tgdn9SHXme7CgHbU=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20190314155106.30106-1-jacopo@jmondi.org>\n\t<20190314155106.30106-3-jacopo@jmondi.org>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<5a29a205-4516-5ae4-b087-0d71ef7040ab@ideasonboard.com>","Date":"Mon, 18 Mar 2019 14:50:07 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.4.0","MIME-Version":"1.0","In-Reply-To":"<20190314155106.30106-3-jacopo@jmondi.org>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v3 2/4] libcamera: formats: Define\n\tFormatEnum type","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":"Mon, 18 Mar 2019 14:50:14 -0000"}}]