From patchwork Wed Jun 19 02:51:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 1455 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0546361A4B for ; Wed, 19 Jun 2019 04:52:25 +0200 (CEST) X-Halon-ID: 3c98ed5b-923d-11e9-8ab4-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 3c98ed5b-923d-11e9-8ab4-005056917a89; Wed, 19 Jun 2019 04:52:12 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 19 Jun 2019 04:51:18 +0200 Message-Id: <20190619025129.21164-6-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619025129.21164-1-niklas.soderlund@ragnatech.se> References: <20190619025129.21164-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 05/16] libcamera: formats: Add ImageFormats X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2019 02:52:26 -0000 Add a new class to hold format information for V4L2 devices and subdevices. The object describes the relationship between either pixel formats (V4L2 devices) or media bus codes (V4L2 subdevice) and a list of image sizes which can be produced with that format. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/formats.cpp | 88 +++++++++++++++++++++++++++++++++ src/libcamera/include/formats.h | 14 ++++++ 2 files changed, 102 insertions(+) diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index 56f4ddb51ffad4d3..312db6557c5beff9 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -24,4 +24,92 @@ namespace libcamera { * resolutions represented by SizeRange items. */ +/** + * \class ImageFormats + * \brief Describe V4L2Device and V4L2SubDevice image formats + * + * This class stores a list of image formats, each associated with a + * corresponding set of image sizes. It is used to describe the formats and + * sizes supported by a V4L2Device or V4L2Subdevice. + * + * Formats are stored as an integer. When used for a V4L2Device, the image + * formats are fourcc pixel formats. When used for a V4L2Subdevice they are + * media bus codes. Both are defined by the V4L2 specification. + * + * Sizes are stored as a list of SizeRange. + */ + +/** + * \brief Add a format and corresponding sizes to the description + * \param[in] format Pixel format or media bus code to describe + * \param[in] sizes List of supported size ranges for the format + * + * \return 0 on success or a negative error code otherwise + * \retval -EEXIST The format is already described + */ +int ImageFormats::addFormat(unsigned int format, const std::vector &sizes) +{ + if (data_.find(format) != data_.end()) + return -EEXIST; + + data_[format] = sizes; + + return 0; +} + +/** + * \brief Check if the list of devices supported formats is empty + * \return True if the list of supported formats is empty + */ +bool ImageFormats::isEmpty() const +{ + return data_.empty(); +} + +/** + * \brief Retrieve a list of all supported image formats + * \return List of pixel formats or media bus codes + */ +std::vector ImageFormats::formats() const +{ + std::vector formats; + formats.reserve(data_.size()); + + /* \todo: Should this be cached instead of computed each time? */ + for (auto const &it : data_) + formats.push_back(it.first); + + return formats; +} + +/** + * \brief Retrieve all sizes for a specific format + * \param[in] format The pixel format or mbus code + * + * Retrieve all size ranges for a specific format. For V4L2Device \a format is a + * pixel format while for a V4L2Subdevice \a format is a media bus code. + * + * \return The list of image sizes supported for \a format, or an empty list if + * the format is not supported + */ +const std::vector &ImageFormats::sizes(unsigned int format) const +{ + static std::vector empty; + + auto const &it = data_.find(format); + if (it == data_.end()) + return empty; + + return it->second; +} + +/** + * \brief Retrieve the map that associates formats to image sizes + * \return The map that associates formats to image sizes + */ +const std::map> &ImageFormats::data() const +{ + return data_; +} + } /* namespace libcamera */ diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h index a73772b1eda068b4..6ec8312590b74f03 100644 --- a/src/libcamera/include/formats.h +++ b/src/libcamera/include/formats.h @@ -17,6 +17,20 @@ namespace libcamera { typedef std::map> FormatEnum; +class ImageFormats +{ +public: + int addFormat(unsigned int format, const std::vector &sizes); + + bool isEmpty() const; + std::vector formats() const; + const std::vector &sizes(unsigned int format) const; + const std::map> &data() const; + +private: + std::map> data_; +}; + } /* namespace libcamera */ #endif /* __LIBCAMERA_FORMATS_H__ */