From c53f8fbbab29385c584f9229c9ee57107b954225 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Fri, 25 Oct 2019 18:14:17 +0200 Subject: 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 Reviewed-by: Laurent Pinchart --- include/libcamera/stream.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'include/libcamera/stream.h') diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h index 2e619cdf..a404eccf 100644 --- a/include/libcamera/stream.h +++ b/include/libcamera/stream.h @@ -14,6 +14,7 @@ #include #include +#include namespace libcamera { @@ -24,15 +25,15 @@ class StreamFormats { public: StreamFormats(); - StreamFormats(const std::map> &formats); + StreamFormats(const std::map> &formats); - std::vector pixelformats() const; - std::vector sizes(unsigned int pixelformat) const; + std::vector pixelformats() const; + std::vector sizes(PixelFormat pixelformat) const; - SizeRange range(unsigned int pixelformat) const; + SizeRange range(PixelFormat pixelformat) const; private: - std::map> formats_; + std::map> formats_; }; enum MemoryType { @@ -44,7 +45,7 @@ struct StreamConfiguration { StreamConfiguration(); StreamConfiguration(const StreamFormats &formats); - unsigned int pixelFormat; + PixelFormat pixelFormat; Size size; MemoryType memoryType; -- cgit v1.2.1