PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: pixelformats: Replace set of modifiers with single value

Browse Source 
DRM fourccs look like they have a per-plane modifier, but in fact each
of them should be same. Hence instead of passing a set of modifiers for
each fourcc in PixelFormat class, we can pass just a single modifier.
So, replace the set with a single value.

Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[Fix compilation error in src/libcamera/pipeline/ipu3/ipu3.cpp]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Kaaira Gupta
2020-04-04 00:39:44 +03:00
committed by Laurent Pinchart
parent 8f8992e4ee
commit 72278369b3
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libcamera/pixelformats.h
+3 -3
View File
@@ -19,7 +19,7 @@ class PixelFormat
{
public:
PixelFormat();
explicit PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers = {});
explicit PixelFormat(uint32_t fourcc, uint64_t modifier = 0);
bool operator==(const PixelFormat &other) const;
bool operator!=(const PixelFormat &other) const { return !(*this == other); }
@@ -29,13 +29,13 @@ public:
operator uint32_t() const { return fourcc_; }
uint32_t fourcc() const { return fourcc_; }
const std::set<uint64_t> &modifiers() const { return modifiers_; }
uint64_t modifier() const { return modifier_; }
std::string toString() const;
private:
uint32_t fourcc_;
std::set<uint64_t> modifiers_;
uint64_t modifier_;
};
} /* namespace libcamera */
src/libcamera/pipeline/ipu3/ipu3.cpp
+5 -5
View File
@@ -34,10 +34,10 @@ LOG_DEFINE_CATEGORY(IPU3)
class IPU3CameraData;
static const std::map<uint32_t, PixelFormat> sensorMbusToPixel = {
{ MEDIA_BUS_FMT_SBGGR10_1X10, PixelFormat(DRM_FORMAT_SBGGR10, { IPU3_FORMAT_MOD_PACKED }) },
{ MEDIA_BUS_FMT_SGBRG10_1X10, PixelFormat(DRM_FORMAT_SGBRG10, { IPU3_FORMAT_MOD_PACKED }) },
{ MEDIA_BUS_FMT_SGRBG10_1X10, PixelFormat(DRM_FORMAT_SGRBG10, { IPU3_FORMAT_MOD_PACKED }) },
{ MEDIA_BUS_FMT_SRGGB10_1X10, PixelFormat(DRM_FORMAT_SRGGB10, { IPU3_FORMAT_MOD_PACKED }) },
{ MEDIA_BUS_FMT_SBGGR10_1X10, PixelFormat(DRM_FORMAT_SBGGR10, IPU3_FORMAT_MOD_PACKED) },
{ MEDIA_BUS_FMT_SGBRG10_1X10, PixelFormat(DRM_FORMAT_SGBRG10, IPU3_FORMAT_MOD_PACKED) },
{ MEDIA_BUS_FMT_SGRBG10_1X10, PixelFormat(DRM_FORMAT_SGRBG10, IPU3_FORMAT_MOD_PACKED) },
{ MEDIA_BUS_FMT_SRGGB10_1X10, PixelFormat(DRM_FORMAT_SRGGB10, IPU3_FORMAT_MOD_PACKED) },
};
class ImgUDevice
@@ -365,7 +365,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()
const Size size = cfg.size;
const IPU3Stream *stream;
if (cfg.pixelFormat.modifiers().count(IPU3_FORMAT_MOD_PACKED))
if (cfg.pixelFormat.modifier() == IPU3_FORMAT_MOD_PACKED)
stream = &data_->rawStream_;
else if (cfg.size == sensorFormat_.size)
stream = &data_->outStream_;
src/libcamera/pixelformats.cpp
+12 -12
View File
@@ -19,9 +19,9 @@ namespace libcamera {
* \brief libcamera image pixel format
*
* The PixelFormat type describes the format of images in the public libcamera
* API. It stores a FourCC value as a 32-bit unsigned integer and a set of
* modifiers. The FourCC and modifiers values are defined in the Linux kernel
* DRM/KMS API (see linux/drm_fourcc.h).
* API. It stores a FourCC value as a 32-bit unsigned integer and a modifier.
* The FourCC and modifier values are defined in the Linux kernel DRM/KMS API
* (see linux/drm_fourcc.h).
*/
/**
@@ -36,12 +36,12 @@ PixelFormat::PixelFormat()
}
/**
* \brief Construct a PixelFormat from a DRM FourCC and a set of modifiers
* \brief Construct a PixelFormat from a DRM FourCC and a modifier
* \param[in] fourcc A DRM FourCC
* \param[in] modifiers A set of DRM FourCC modifiers
* \param[in] modifier A DRM FourCC modifier
*/
PixelFormat::PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers)
: fourcc_(fourcc), modifiers_(modifiers)
PixelFormat::PixelFormat(uint32_t fourcc, uint64_t modifier)
: fourcc_(fourcc), modifier_(modifier)
{
}
@@ -51,7 +51,7 @@ PixelFormat::PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers)
*/
bool PixelFormat::operator==(const PixelFormat &other) const
{
return fourcc_ == other.fourcc() && modifiers_ == other.modifiers_;
return fourcc_ == other.fourcc() && modifier_ == other.modifier_;
}
/**
@@ -70,7 +70,7 @@ bool PixelFormat::operator<(const PixelFormat &other) const
return true;
if (fourcc_ > other.fourcc_)
return false;
return modifiers_ < modifiers_;
return modifier_ < other.modifier_;
}
/**
@@ -97,9 +97,9 @@ bool PixelFormat::operator<(const PixelFormat &other) const
*/
/**
* \fn PixelFormat::modifiers() const
* \brief Retrieve the pixel format modifiers
* \return Set of DRM modifiers
* \fn PixelFormat::modifier() const
* \brief Retrieve the pixel format modifier
* \return DRM modifier
*/
/**