Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-24 00:55:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: stream: Use the newly defined PixelFormat

Browse source 
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>
This commit is contained in:
Jacopo Mondi 2019-10-25 18:14:17 +02:00 • committed by Laurent Pinchart
parent 656d875734
commit c53f8fbbab
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/libcamera/stream.h
View file

@ -14,6 +14,7 @@
#include <libcamera/buffer.h> #include <libcamera/buffer.h>
#include <libcamera/geometry.h> #include <libcamera/geometry.h>
#include <libcamera/pixelformats.h>
namespace libcamera { namespace libcamera {
@ -24,15 +25,15 @@ class StreamFormats
{ {
public: public:
StreamFormats(); StreamFormats();
StreamFormats(const std::map<unsigned int, std::vector<SizeRange>> &formats); StreamFormats(const std::map<PixelFormat, std::vector<SizeRange>> &formats);
std::vector<unsigned int> pixelformats() const; std::vector<PixelFormat> pixelformats() const;
std::vector<Size> sizes(unsigned int pixelformat) const; std::vector<Size> sizes(PixelFormat pixelformat) const;
SizeRange range(unsigned int pixelformat) const; SizeRange range(PixelFormat pixelformat) const;
private: private:
std::map<unsigned int, std::vector<SizeRange>> formats_; std::map<PixelFormat, std::vector<SizeRange>> formats_;
}; };
enum MemoryType { enum MemoryType {
@ -44,7 +45,7 @@ struct StreamConfiguration {
StreamConfiguration(); StreamConfiguration();
StreamConfiguration(const StreamFormats &formats); StreamConfiguration(const StreamFormats &formats);
unsigned int pixelFormat; PixelFormat pixelFormat;
Size size; Size size;
MemoryType memoryType; MemoryType memoryType;

17
src/libcamera/stream.cpp
View file

@ -94,7 +94,7 @@ StreamFormats::StreamFormats()
* \brief Construct a StreamFormats object with a map of image formats * \brief Construct a StreamFormats object with a map of image formats
* \param[in] formats A map of pixel formats to a sizes description * \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) : formats_(formats)
{ {
} }
@ -103,9 +103,9 @@ StreamFormats::StreamFormats(const std::map<unsigned int, std::vector<SizeRange>
* \brief Retrieve the list of supported pixel formats * \brief Retrieve the list of supported pixel formats
* \return 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_) for (auto const &it : formats_)
formats.push_back(it.first); 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 * \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 * If the sizes described for \a pixelformat are discrete they are returned
* directly. * directly.
@ -127,7 +127,7 @@ std::vector<unsigned int> StreamFormats::pixelformats() const
* *
* \return A list of frame sizes or an empty list on error * \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. * 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 * \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 * 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 * 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 * \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); auto const it = formats_.find(pixelformat);
if (it == formats_.end()) if (it == formats_.end())
@ -311,9 +311,6 @@ StreamConfiguration::StreamConfiguration(const StreamFormats &formats)
/** /**
* \var StreamConfiguration::pixelFormat * \var StreamConfiguration::pixelFormat
* \brief Stream pixel format * \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.
*/ */
/** /**