From patchwork Mon May 27 00:15:37 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: 1305 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 28FFA618F9 for ; Mon, 27 May 2019 02:16:12 +0200 (CEST) X-Halon-ID: 9f6e729b-8014-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 9f6e729b-8014-11e9-8ab4-005056917a89; Mon, 27 May 2019 02:16:07 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 27 May 2019 02:15:37 +0200 Message-Id: <20190527001543.13593-12-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190527001543.13593-1-niklas.soderlund@ragnatech.se> References: <20190527001543.13593-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 11/17] libcamera: stream: Add StreamFormats 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: Mon, 27 May 2019 00:16:14 -0000 Add a StreamFormats which describes all the formats a stream can support. The object does not collect any formation itself but can simplify users interaction with formats as it's able to translate a stream format range into discrete list and a discrete list to a range. Signed-off-by: Niklas Söderlund --- include/libcamera/stream.h | 16 +++ src/libcamera/stream.cpp | 216 +++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+) diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h index e38c0e7e827d5888..48daf5ac23f55d85 100644 --- a/include/libcamera/stream.h +++ b/include/libcamera/stream.h @@ -7,6 +7,7 @@ #ifndef __LIBCAMERA_STREAM_H__ #define __LIBCAMERA_STREAM_H__ +#include #include #include @@ -18,6 +19,21 @@ namespace libcamera { class Camera; class Stream; +class StreamFormats +{ +public: + StreamFormats(); + StreamFormats(const std::map> &formats); + + std::vector pixelformats() const; + std::vector sizes(unsigned int pixelformat) const; + + SizeRange range(unsigned int pixelformat) const; + +private: + std::map> formats_; +}; + struct StreamConfiguration { StreamConfiguration() : stream_(nullptr) diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index eecd37160150d55c..a2931902fda2baa5 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -7,6 +7,7 @@ #include +#include #include #include @@ -36,6 +37,221 @@ namespace libcamera { LOG_DEFINE_CATEGORY(Stream) +/** + * \class StreamFormats + * \brief Hold information about supported stream formats + * + * The StreamFormats class holds information about pixel formats and frame + * sizes a stream supports. The class groups size information by the pixel + * format which can produce it. There are two ways to examine the size + * information, as a range or as a list of discrete sizes. + * + * When sizes are viewed as a range it describes the minimum and maximum width + * and height values. There is a possibility to supplement the range description + * with a horizontal och vertical stepping size. The stepping size describes the + * step size in pixel from the minimum with/height. + * + * When sizes is viewed as a list of discrete sizes it describes exact dimensions + * which can be selected and used. + * + * Pipeline handlers can create StreamFormats describing each pixel format using + * either a range or a list of discrete sizes. The StreamFormats class attempts + * to translates between the two different ways to view them. The translations + * are performed as: + * + * - If a pixel format is described as a list of discrete sizes a range is + * created by taking the minim and maximum width/height in the list. + * The stepping information is not recreated and set to 1. + * + * - If a pixel format is described as a range a list of discrete sizes which + * fits inside that range are selected from a list of common sizes. The + * stepping information is taken into consideration when generating the + * sizes. + * + * Applications examining sizes as a range with stepping values of 1 should be + * aware that the range could be generated form a list of discrete sizes and + * there could be big gaps in the range to what the stream can support. + * + * All sizes retrieved from StreamFormats should be treated as advisory and no + * size should be considered to be supported until its been verified using + * CameraConfiguration::validate(). + */ + +/** + * \brief Construct a empty StreamFormats object + */ +StreamFormats::StreamFormats() +{ +} + +/** + * \brief Construct a StreamFormats object + * \param[in] formats A map of pixel formats to a sizes description + */ +StreamFormats::StreamFormats(const std::map> &formats) + : formats_(formats) +{ +} + +/** + * \brief Retrieve the list of pixel formats supported + * \returns List of pixel formats + */ +std::vector StreamFormats::pixelformats() const +{ + std::vector formats; + + for (auto const &it : formats_) + formats.push_back(it.first); + + return formats; +} + +/** + * \brief Retrieve the list of frame sizes + * \param[in] pixelformat Pixel format to retrieve sizes for + * \returns List description of frame sizes + */ +std::vector StreamFormats::sizes(unsigned int pixelformat) const +{ + /* + * Sizes to try and extract from ranges. + * \todo Verify list of resolutions are good, current list compiled + * from v4l2 documentation and source code as well as lists of + * common frame sizes. + */ + static const std::vector rangeDiscreteSizes = { + Size(160, 120), + Size(240, 160), + Size(320, 240), + Size(400, 240), + Size(480, 320), + Size(640, 360), + Size(640, 480), + Size(720, 480), + Size(720, 576), + Size(768, 480), + Size(800, 600), + Size(854, 480), + Size(960, 540), + Size(960, 640), + Size(1024, 576), + Size(1024, 600), + Size(1024, 768), + Size(1152, 864), + Size(1280, 1024), + Size(1280, 1080), + Size(1280, 720), + Size(1280, 800), + Size(1360, 768), + Size(1366, 768), + Size(1400, 1050), + Size(1440, 900), + Size(1536, 864), + Size(1600, 1200), + Size(1600, 900), + Size(1680, 1050), + Size(1920, 1080), + Size(1920, 1200), + Size(2048, 1080), + Size(2048, 1152), + Size(2048, 1536), + Size(2160, 1080), + Size(2560, 1080), + Size(2560, 1440), + Size(2560, 1600), + Size(2560, 2048), + Size(2960, 1440), + Size(3200, 1800), + Size(3200, 2048), + Size(3200, 2400), + Size(3440, 1440), + Size(3840, 1080), + Size(3840, 1600), + Size(3840, 2160), + Size(3840, 2400), + Size(4096, 2160), + Size(5120, 2160), + Size(5120, 2880), + Size(7680, 4320), + }; + std::vector sizes; + + /* Make sure pixel format exists. */ + auto const &it = formats_.find(pixelformat); + if (it == formats_.end()) + return {}; + + /* Try create list of discrete sizes. */ + const std::vector &ranges = it->second; + bool discrete = true; + for (const SizeRange &range : ranges) { + if (range.min != range.max) { + discrete = false; + break; + } + sizes.emplace_back(range.min.width, range.min.height); + } + + /* If discrete not possible generate from range. */ + if (!discrete) { + if (ranges.size() != 1) { + LOG(Stream, Error) << "Range format is ambiguous"; + return {}; + } + + const SizeRange &limit = ranges.front(); + sizes.clear(); + + for (const Size &size : rangeDiscreteSizes) { + if (size.width < limit.min.width || + size.width > limit.max.width || + size.height < limit.min.height || + size.height > limit.max.height || + (size.width - limit.min.width) % limit.vStep || + (size.height - limit.min.height) % limit.hStep) + continue; + + sizes.push_back(size); + } + } + + std::sort(sizes.begin(), sizes.end()); + + return sizes; +} + +/** + * \brief Retrieve a frame size range + * \param[in] pixelformat Pixel format to retrieve range for + * \returns Range description of frame size + */ +SizeRange StreamFormats::range(unsigned int pixelformat) const +{ + auto const it = formats_.find(pixelformat); + if (it == formats_.end()) + return {}; + + const SizeRange &first = it->second.front(); + if (it->second.size() == 1) + return first; + + LOG(Stream, Debug) << "Building range from discret"; + + SizeRange range(first.min.width, first.min.height, + first.max.width, first.max.height); + + for (const SizeRange &limit : it->second) { + if (limit.min < range.min) + range.min = limit.min; + + if (limit.max > range.max) + range.max = limit.max; + } + + return range; +} + /** * \struct StreamConfiguration * \brief Configuration parameters for a stream