[{"id":11469,"web_url":"https://patchwork.libcamera.org/comment/11469/","msgid":"<20200721152101.aixhjsqouzum7b34@uno.localdomain>","date":"2020-07-21T15:21:01","subject":"Re: [libcamera-devel] [PATCH v2 2/3] libcamera: formats: Remove\n\tImageFormats","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas\n\nOn Tue, Jul 21, 2020 at 03:55:40PM +0200, Niklas Söderlund wrote:\n> The ImageFormats helper class is not used anymore and can be removed.\n>\n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  include/libcamera/internal/formats.h | 14 -----\n>  src/libcamera/formats.cpp            | 88 ----------------------------\n\n\\o/\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n  j\n\n>  2 files changed, 102 deletions(-)\n>\n> diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\n> index cad41ad864a41b62..0bb15104429489aa 100644\n> --- a/include/libcamera/internal/formats.h\n> +++ b/include/libcamera/internal/formats.h\n> @@ -19,20 +19,6 @@\n>\n>  namespace libcamera {\n>\n> -class ImageFormats\n> -{\n> -public:\n> -\tint addFormat(unsigned int format, const std::vector<SizeRange> &sizes);\n> -\n> -\tbool isEmpty() const;\n> -\tstd::vector<unsigned int> formats() const;\n> -\tconst std::vector<SizeRange> &sizes(unsigned int format) const;\n> -\tconst std::map<unsigned int, std::vector<SizeRange>> &data() const;\n> -\n> -private:\n> -\tstd::map<unsigned int, std::vector<SizeRange>> data_;\n> -};\n> -\n>  struct PixelFormatPlaneInfo\n>  {\n>  \tunsigned int bytesPerGroup;\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index af3996c954ae1457..60b42ce23c2145fd 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -23,94 +23,6 @@ namespace libcamera {\n>\n>  LOG_DEFINE_CATEGORY(Formats)\n>\n> -/**\n> - * \\class ImageFormats\n> - * \\brief Describe V4L2Device and V4L2SubDevice image formats\n> - *\n> - * This class stores a list of image formats, each associated with a\n> - * corresponding set of image sizes. It is used to describe the formats and\n> - * sizes supported by a V4L2Device or V4L2Subdevice.\n> - *\n> - * Formats are stored as an integer. When used for a V4L2Device, the image\n> - * formats are fourcc pixel formats. When used for a V4L2Subdevice they are\n> - * media bus codes. Both are defined by the V4L2 specification.\n> - *\n> - * Sizes are stored as a list of SizeRange.\n> - */\n> -\n> -/**\n> - * \\brief Add a format and corresponding sizes to the description\n> - * \\param[in] format Pixel format or media bus code to describe\n> - * \\param[in] sizes List of supported size ranges for the format\n> - *\n> - * \\return 0 on success or a negative error code otherwise\n> - * \\retval -EEXIST The format is already described\n> - */\n> -int ImageFormats::addFormat(unsigned int format, const std::vector<SizeRange> &sizes)\n> -{\n> -\tif (data_.find(format) != data_.end())\n> -\t\treturn -EEXIST;\n> -\n> -\tdata_[format] = sizes;\n> -\n> -\treturn 0;\n> -}\n> -\n> -/**\n> - * \\brief Check if the list of devices supported formats is empty\n> - * \\return True if the list of supported formats is empty\n> - */\n> -bool ImageFormats::isEmpty() const\n> -{\n> -\treturn data_.empty();\n> -}\n> -\n> -/**\n> - * \\brief Retrieve a list of all supported image formats\n> - * \\return List of pixel formats or media bus codes\n> - */\n> -std::vector<unsigned int> ImageFormats::formats() const\n> -{\n> -\tstd::vector<unsigned int> formats;\n> -\tformats.reserve(data_.size());\n> -\n> -\t/* \\todo: Should this be cached instead of computed each time? */\n> -\tfor (auto const &it : data_)\n> -\t\tformats.push_back(it.first);\n> -\n> -\treturn formats;\n> -}\n> -\n> -/**\n> - * \\brief Retrieve all sizes for a specific format\n> - * \\param[in] format The pixel format or mbus code\n> - *\n> - * Retrieve all size ranges for a specific format. For V4L2Device \\a format is a\n> - * pixel format while for a V4L2Subdevice \\a format is a media bus code.\n> - *\n> - * \\return The list of image sizes supported for \\a format, or an empty list if\n> - * the format is not supported\n> - */\n> -const std::vector<SizeRange> &ImageFormats::sizes(unsigned int format) const\n> -{\n> -\tstatic const std::vector<SizeRange> empty;\n> -\n> -\tauto const &it = data_.find(format);\n> -\tif (it == data_.end())\n> -\t\treturn empty;\n> -\n> -\treturn it->second;\n> -}\n> -\n> -/**\n> - * \\brief Retrieve the map that associates formats to image sizes\n> - * \\return The map that associates formats to image sizes\n> - */\n> -const std::map<unsigned int, std::vector<SizeRange>> &ImageFormats::data() const\n> -{\n> -\treturn data_;\n> -}\n> -\n>  /**\n>   * \\class PixelFormatPlaneInfo\n>   * \\brief Information about a single plane of a pixel format\n> --\n> 2.27.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":"<libcamera-devel-bounces@lists.libcamera.org>","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 28033BDB1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 21 Jul 2020 15:17:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 01B3A60907;\n\tTue, 21 Jul 2020 17:17:25 +0200 (CEST)","from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AFE00605B2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 21 Jul 2020 17:17:23 +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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 2E1C6C0005;\n\tTue, 21 Jul 2020 15:17:22 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Tue, 21 Jul 2020 17:21:01 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","Message-ID":"<20200721152101.aixhjsqouzum7b34@uno.localdomain>","References":"<20200721135541.2931205-1-niklas.soderlund@ragnatech.se>\n\t<20200721135541.2931205-3-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200721135541.2931205-3-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH v2 2/3] libcamera: formats: Remove\n\tImageFormats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]