libcamera: Use PixelFormat instead of unsigned int where appropriate

Use the PixelFormat instead of unsigned int where a pixel format is to
be used. PixelFormat is defined as an unsigned int but is about to be
turned into a class to add functionality.

There is no functional change in this patch.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2020-02-28 02:38:18 +01:00
parent 9a1e71b8a1
commit f28ca20960
10 changed files with 22 additions and 18 deletions
+1 -1
View File
@@ -349,7 +349,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()
for (unsigned int i = 0; i < config_.size(); ++i) {
StreamConfiguration &cfg = config_[i];
const unsigned int pixelFormat = cfg.pixelFormat;
const PixelFormat pixelFormat = cfg.pixelFormat;
const Size size = cfg.size;
const IPU3Stream *stream;
+1 -1
View File
@@ -433,7 +433,7 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,
CameraConfiguration::Status RkISP1CameraConfiguration::validate()
{
static const std::array<unsigned int, 8> formats{
static const std::array<PixelFormat, 8> formats{
DRM_FORMAT_YUYV,
DRM_FORMAT_YVYU,
DRM_FORMAT_VYUY,
+2 -2
View File
@@ -107,10 +107,10 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()
StreamConfiguration &cfg = config_[0];
const StreamFormats &formats = cfg.formats();
const unsigned int pixelFormat = cfg.pixelFormat;
const PixelFormat pixelFormat = cfg.pixelFormat;
const Size size = cfg.size;
const std::vector<unsigned int> pixelFormats = formats.pixelformats();
const std::vector<PixelFormat> pixelFormats = formats.pixelformats();
auto iter = std::find(pixelFormats.begin(), pixelFormats.end(), pixelFormat);
if (iter == pixelFormats.end()) {
cfg.pixelFormat = pixelFormats.front();
+2 -2
View File
@@ -106,7 +106,7 @@ private:
namespace {
constexpr std::array<unsigned int, 3> pixelformats{
constexpr std::array<PixelFormat, 3> pixelformats{
DRM_FORMAT_RGB888,
DRM_FORMAT_BGR888,
DRM_FORMAT_BGRA8888,
@@ -177,7 +177,7 @@ CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,
ImageFormats formats;
for (unsigned int pixelformat : pixelformats) {
for (PixelFormat pixelformat : pixelformats) {
/* The scaler hardcodes a x3 scale-up ratio. */
std::vector<SizeRange> sizes{
SizeRange{ 48, 48, 4096, 2160 }