diff options
| author | Jacopo Mondi <jacopo@jmondi.org> | 2019-10-25 18:14:17 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-28 13:08:08 +0200 |
| commit | c53f8fbbab29385c584f9229c9ee57107b954225 (patch) | |
| tree | 652aac356964bd800853f524f633f9057f3db2de /src/libcamera/stream.cpp | |
| parent | 656d8757347f1f9f5df93da863f66fa589cee063 (diff) | |
libcamera: stream: Use the newly defined PixelFormat
Use the newly defined PixelFormat type to define the image format
contained in the StreamFormats and StreamConfiguration classes.
Update the classes documentation accordingly.
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/libcamera/stream.cpp')
| -rw-r--r-- | src/libcamera/stream.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index b8e7209c..45f31ae1 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -94,7 +94,7 @@ StreamFormats::StreamFormats() * \brief Construct a StreamFormats object with a map of image formats * \param[in] formats A map of pixel formats to a sizes description */ -StreamFormats::StreamFormats(const std::map<unsigned int, std::vector<SizeRange>> &formats) +StreamFormats::StreamFormats(const std::map<PixelFormat, std::vector<SizeRange>> &formats) : formats_(formats) { } @@ -103,9 +103,9 @@ StreamFormats::StreamFormats(const std::map<unsigned int, std::vector<SizeRange> * \brief Retrieve the list of supported pixel formats * \return The list of supported pixel formats */ -std::vector<unsigned int> StreamFormats::pixelformats() const +std::vector<PixelFormat> StreamFormats::pixelformats() const { - std::vector<unsigned int> formats; + std::vector<PixelFormat> formats; for (auto const &it : formats_) formats.push_back(it.first); @@ -115,7 +115,7 @@ std::vector<unsigned int> StreamFormats::pixelformats() const /** * \brief Retrieve the list of frame sizes supported for \a pixelformat - * \param[in] pixelformat Pixel format to retrieve sizes for + * \param[in] pixelformat PixelFormat to retrieve sizes for * * If the sizes described for \a pixelformat are discrete they are returned * directly. @@ -127,7 +127,7 @@ std::vector<unsigned int> StreamFormats::pixelformats() const * * \return A list of frame sizes or an empty list on error */ -std::vector<Size> StreamFormats::sizes(unsigned int pixelformat) const +std::vector<Size> StreamFormats::sizes(PixelFormat pixelformat) const { /* * Sizes to try and extract from ranges. @@ -230,7 +230,7 @@ std::vector<Size> StreamFormats::sizes(unsigned int pixelformat) const /** * \brief Retrieve the range of minimum and maximum sizes - * \param[in] pixelformat Pixel format to retrieve range for + * \param[in] pixelformat PixelFormat to retrieve range for * * If the size described for \a pixelformat is a range, that range is returned * directly. If the sizes described are a list of discrete sizes, a range is @@ -240,7 +240,7 @@ std::vector<Size> StreamFormats::sizes(unsigned int pixelformat) const * * \return A range of valid image sizes or an empty range on error */ -SizeRange StreamFormats::range(unsigned int pixelformat) const +SizeRange StreamFormats::range(PixelFormat pixelformat) const { auto const it = formats_.find(pixelformat); if (it == formats_.end()) @@ -311,9 +311,6 @@ StreamConfiguration::StreamConfiguration(const StreamFormats &formats) /** * \var StreamConfiguration::pixelFormat * \brief Stream pixel format - * - * This is a little endian four character code representation of the pixel - * format described in V4L2 using the V4L2_PIX_FMT_* definitions. */ /** |