NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: PixelFormat: Make constructor explicit

Browse source 
To achieve the goal of preventing unwanted conversion between a DRM and
a V4L2 FourCC, make the PixelFormat constructor that takes an integer
value explicit. All users of pixel formats flagged by the compiler
are fixed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-03-16 10:07:26 +02:00 • committed by Niklas Söderlund
parent 8c0bbcd3d3
commit 718f5e99a9
9 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/pixelformats.h
View file

@ -19,7 +19,7 @@ class PixelFormat
{ {
public: public:
PixelFormat(); PixelFormat();
PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers = {}); explicit PixelFormat(uint32_t fourcc, const std::set<uint64_t> &modifiers = {});
bool operator==(const PixelFormat &other) const; bool operator==(const PixelFormat &other) const;
bool operator!=(const PixelFormat &other) const { return !(*this == other); } bool operator!=(const PixelFormat &other) const { return !(*this == other); }

4
src/gstreamer/gstlibcamera-utils.cpp
View file

@ -154,9 +154,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,
if (gst_structure_has_name(s, "video/x-raw")) { if (gst_structure_has_name(s, "video/x-raw")) {
const gchar *format = gst_structure_get_string(s, "format"); const gchar *format = gst_structure_get_string(s, "format");
gst_format = gst_video_format_from_string(format); gst_format = gst_video_format_from_string(format);
stream_cfg.pixelFormat = gst_format_to_drm(gst_format); stream_cfg.pixelFormat = PixelFormat(gst_format_to_drm(gst_format));
} else if (gst_structure_has_name(s, "image/jpeg")) { } else if (gst_structure_has_name(s, "image/jpeg")) {
stream_cfg.pixelFormat = DRM_FORMAT_MJPEG; stream_cfg.pixelFormat = PixelFormat(DRM_FORMAT_MJPEG);
} else { } else {
g_critical("Unsupported media type: %s", gst_structure_get_name(s)); g_critical("Unsupported media type: %s", gst_structure_get_name(s));
} }

6
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -246,7 +246,7 @@ IPU3CameraConfiguration::IPU3CameraConfiguration(Camera *camera,
void IPU3CameraConfiguration::adjustStream(StreamConfiguration &cfg, bool scale) void IPU3CameraConfiguration::adjustStream(StreamConfiguration &cfg, bool scale)
{ {
/* The only pixel format the driver supports is NV12. */ /* The only pixel format the driver supports is NV12. */
cfg.pixelFormat = DRM_FORMAT_NV12; cfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);
if (scale) { if (scale) {
/* /*
@ -401,7 +401,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,
StreamConfiguration cfg = {}; StreamConfiguration cfg = {};
IPU3Stream *stream = nullptr; IPU3Stream *stream = nullptr;
cfg.pixelFormat = DRM_FORMAT_NV12; cfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);
switch (role) { switch (role) {
case StreamRole::StillCapture: case StreamRole::StillCapture:
@ -1141,7 +1141,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,
return 0; return 0;
V4L2DeviceFormat outputFormat = {}; V4L2DeviceFormat outputFormat = {};
outputFormat.fourcc = dev->toV4L2Fourcc(DRM_FORMAT_NV12); outputFormat.fourcc = dev->toV4L2Fourcc(PixelFormat(DRM_FORMAT_NV12));
outputFormat.size = cfg.size; outputFormat.size = cfg.size;
outputFormat.planesCount = 2; outputFormat.planesCount = 2;

18
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View file

@ -433,13 +433,13 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,
CameraConfiguration::Status RkISP1CameraConfiguration::validate() CameraConfiguration::Status RkISP1CameraConfiguration::validate()
{ {
static const std::array<PixelFormat, 8> formats{ static const std::array<PixelFormat, 8> formats{
DRM_FORMAT_YUYV, PixelFormat(DRM_FORMAT_YUYV),
DRM_FORMAT_YVYU, PixelFormat(DRM_FORMAT_YVYU),
DRM_FORMAT_VYUY, PixelFormat(DRM_FORMAT_VYUY),
DRM_FORMAT_NV16, PixelFormat(DRM_FORMAT_NV16),
DRM_FORMAT_NV61, PixelFormat(DRM_FORMAT_NV61),
DRM_FORMAT_NV21, PixelFormat(DRM_FORMAT_NV21),
DRM_FORMAT_NV12, PixelFormat(DRM_FORMAT_NV12),
/* \todo Add support for 8-bit greyscale to DRM formats */ /* \todo Add support for 8-bit greyscale to DRM formats */
}; };
@ -461,7 +461,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()
if (std::find(formats.begin(), formats.end(), cfg.pixelFormat) == if (std::find(formats.begin(), formats.end(), cfg.pixelFormat) ==
formats.end()) { formats.end()) {
LOG(RkISP1, Debug) << "Adjusting format to NV12"; LOG(RkISP1, Debug) << "Adjusting format to NV12";
cfg.pixelFormat = DRM_FORMAT_NV12, cfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12),
status = Adjusted; status = Adjusted;
} }
@ -540,7 +540,7 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera
return config; return config;
StreamConfiguration cfg{}; StreamConfiguration cfg{};
cfg.pixelFormat = DRM_FORMAT_NV12; cfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);
cfg.size = data->sensor_->resolution(); cfg.size = data->sensor_->resolution();
config->addConfiguration(cfg); config->addConfiguration(cfg);

10
src/libcamera/pipeline/vimc.cpp
View file

@ -106,9 +106,9 @@ private:
namespace { namespace {
static const std::array<PixelFormat, 3> pixelformats{ static const std::array<PixelFormat, 3> pixelformats{
DRM_FORMAT_RGB888, PixelFormat(DRM_FORMAT_RGB888),
DRM_FORMAT_BGR888, PixelFormat(DRM_FORMAT_BGR888),
DRM_FORMAT_BGRA8888, PixelFormat(DRM_FORMAT_BGRA8888),
}; };
} /* namespace */ } /* namespace */
@ -137,7 +137,7 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()
if (std::find(pixelformats.begin(), pixelformats.end(), cfg.pixelFormat) == if (std::find(pixelformats.begin(), pixelformats.end(), cfg.pixelFormat) ==
pixelformats.end()) { pixelformats.end()) {
LOG(VIMC, Debug) << "Adjusting format to RGB24"; LOG(VIMC, Debug) << "Adjusting format to RGB24";
cfg.pixelFormat = DRM_FORMAT_BGR888; cfg.pixelFormat = PixelFormat(DRM_FORMAT_BGR888);
status = Adjusted; status = Adjusted;
} }
@ -186,7 +186,7 @@ CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,
StreamConfiguration cfg(formats); StreamConfiguration cfg(formats);
cfg.pixelFormat = DRM_FORMAT_BGR888; cfg.pixelFormat = PixelFormat(DRM_FORMAT_BGR888);
cfg.size = { 1920, 1080 }; cfg.size = { 1920, 1080 };
cfg.bufferCount = 4; cfg.bufferCount = 4;

26
src/libcamera/v4l2_videodevice.cpp
View file

@ -1427,39 +1427,39 @@ PixelFormat V4L2VideoDevice::toPixelFormat(uint32_t v4l2Fourcc)
switch (v4l2Fourcc) { switch (v4l2Fourcc) {
/* RGB formats. */ /* RGB formats. */
case V4L2_PIX_FMT_RGB24: case V4L2_PIX_FMT_RGB24:
return DRM_FORMAT_BGR888; return PixelFormat(DRM_FORMAT_BGR888);
case V4L2_PIX_FMT_BGR24: case V4L2_PIX_FMT_BGR24:
return DRM_FORMAT_RGB888; return PixelFormat(DRM_FORMAT_RGB888);
case V4L2_PIX_FMT_ARGB32: case V4L2_PIX_FMT_ARGB32:
return DRM_FORMAT_BGRA8888; return PixelFormat(DRM_FORMAT_BGRA8888);
/* YUV packed formats. */ /* YUV packed formats. */
case V4L2_PIX_FMT_YUYV: case V4L2_PIX_FMT_YUYV:
return DRM_FORMAT_YUYV; return PixelFormat(DRM_FORMAT_YUYV);
case V4L2_PIX_FMT_YVYU: case V4L2_PIX_FMT_YVYU:
return DRM_FORMAT_YVYU; return PixelFormat(DRM_FORMAT_YVYU);
case V4L2_PIX_FMT_UYVY: case V4L2_PIX_FMT_UYVY:
return DRM_FORMAT_UYVY; return PixelFormat(DRM_FORMAT_UYVY);
case V4L2_PIX_FMT_VYUY: case V4L2_PIX_FMT_VYUY:
return DRM_FORMAT_VYUY; return PixelFormat(DRM_FORMAT_VYUY);
/* YUY planar formats. */ /* YUY planar formats. */
case V4L2_PIX_FMT_NV16: case V4L2_PIX_FMT_NV16:
case V4L2_PIX_FMT_NV16M: case V4L2_PIX_FMT_NV16M:
return DRM_FORMAT_NV16; return PixelFormat(DRM_FORMAT_NV16);
case V4L2_PIX_FMT_NV61: case V4L2_PIX_FMT_NV61:
case V4L2_PIX_FMT_NV61M: case V4L2_PIX_FMT_NV61M:
return DRM_FORMAT_NV61; return PixelFormat(DRM_FORMAT_NV61);
case V4L2_PIX_FMT_NV12: case V4L2_PIX_FMT_NV12:
case V4L2_PIX_FMT_NV12M: case V4L2_PIX_FMT_NV12M:
return DRM_FORMAT_NV12; return PixelFormat(DRM_FORMAT_NV12);
case V4L2_PIX_FMT_NV21: case V4L2_PIX_FMT_NV21:
case V4L2_PIX_FMT_NV21M: case V4L2_PIX_FMT_NV21M:
return DRM_FORMAT_NV21; return PixelFormat(DRM_FORMAT_NV21);
/* Compressed formats. */ /* Compressed formats. */
case V4L2_PIX_FMT_MJPEG: case V4L2_PIX_FMT_MJPEG:
return DRM_FORMAT_MJPEG; return PixelFormat(DRM_FORMAT_MJPEG);
/* V4L2 formats not yet supported by DRM. */ /* V4L2 formats not yet supported by DRM. */
case V4L2_PIX_FMT_GREY: case V4L2_PIX_FMT_GREY:
@ -1472,7 +1472,7 @@ PixelFormat V4L2VideoDevice::toPixelFormat(uint32_t v4l2Fourcc)
LogError).stream() LogError).stream()
<< "Unsupported V4L2 pixel format " << "Unsupported V4L2 pixel format "
<< utils::hex(v4l2Fourcc); << utils::hex(v4l2Fourcc);
return 0; return PixelFormat();
} }
} }

28
src/v4l2/v4l2_camera_proxy.cpp
View file

@ -535,21 +535,21 @@ namespace {
static const std::array<PixelFormatInfo, 13> pixelFormatInfo = {{ static const std::array<PixelFormatInfo, 13> pixelFormatInfo = {{
/* RGB formats. */ /* RGB formats. */
{ DRM_FORMAT_RGB888, V4L2_PIX_FMT_BGR24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_RGB888), V4L2_PIX_FMT_BGR24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_BGR888, V4L2_PIX_FMT_RGB24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_BGR888), V4L2_PIX_FMT_RGB24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_BGRA8888, V4L2_PIX_FMT_ARGB32, 1, {{ { 32, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_BGRA8888), V4L2_PIX_FMT_ARGB32, 1, {{ { 32, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
/* YUV packed formats. */ /* YUV packed formats. */
{ DRM_FORMAT_UYVY, V4L2_PIX_FMT_UYVY, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_UYVY), V4L2_PIX_FMT_UYVY, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_VYUY, V4L2_PIX_FMT_VYUY, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_VYUY), V4L2_PIX_FMT_VYUY, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_YUYV, V4L2_PIX_FMT_YUYV, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_YUYV), V4L2_PIX_FMT_YUYV, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_YVYU, V4L2_PIX_FMT_YVYU, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_YVYU), V4L2_PIX_FMT_YVYU, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
/* YUY planar formats. */ /* YUY planar formats. */
{ DRM_FORMAT_NV12, V4L2_PIX_FMT_NV12, 2, {{ { 8, 1, 1 }, { 16, 2, 2 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV12), V4L2_PIX_FMT_NV12, 2, {{ { 8, 1, 1 }, { 16, 2, 2 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_NV21, V4L2_PIX_FMT_NV21, 2, {{ { 8, 1, 1 }, { 16, 2, 2 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV21), V4L2_PIX_FMT_NV21, 2, {{ { 8, 1, 1 }, { 16, 2, 2 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_NV16, V4L2_PIX_FMT_NV16, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV16), V4L2_PIX_FMT_NV16, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_NV61, V4L2_PIX_FMT_NV61, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV61), V4L2_PIX_FMT_NV61, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_NV24, V4L2_PIX_FMT_NV24, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV24), V4L2_PIX_FMT_NV24, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} },
{ DRM_FORMAT_NV42, V4L2_PIX_FMT_NV42, 2, {{ { 8, 1, 1 }, { 16, 1, 1 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV42), V4L2_PIX_FMT_NV42, 2, {{ { 8, 1, 1 }, { 16, 1, 1 }, { 0, 0, 0 } }} },
}}; }};
} /* namespace */ } /* namespace */
@ -593,7 +593,7 @@ PixelFormat V4L2CameraProxy::v4l2ToDrm(uint32_t format)
return info.v4l2Format == format; return info.v4l2Format == format;
}); });
if (info == pixelFormatInfo.end()) if (info == pixelFormatInfo.end())
return format; return PixelFormat();
return info->format; return info->format;
} }

24
test/stream/stream_formats.cpp
View file

@ -55,40 +55,40 @@ protected:
{ {
/* Test discrete sizes */ /* Test discrete sizes */
StreamFormats discrete({ StreamFormats discrete({
{ 1, { SizeRange(100, 100), SizeRange(200, 200) } }, { PixelFormat(1), { SizeRange(100, 100), SizeRange(200, 200) } },
{ 2, { SizeRange(300, 300), SizeRange(400, 400) } }, { PixelFormat(2), { SizeRange(300, 300), SizeRange(400, 400) } },
}); });
if (testSizes("discrete 1", discrete.sizes(1), if (testSizes("discrete 1", discrete.sizes(PixelFormat(1)),
{ Size(100, 100), Size(200, 200) })) { Size(100, 100), Size(200, 200) }))
return TestFail; return TestFail;
if (testSizes("discrete 2", discrete.sizes(2), if (testSizes("discrete 2", discrete.sizes(PixelFormat(2)),
{ Size(300, 300), Size(400, 400) })) { Size(300, 300), Size(400, 400) }))
return TestFail; return TestFail;
/* Test range sizes */ /* Test range sizes */
StreamFormats range({ StreamFormats range({
{ 1, { SizeRange(640, 480, 640, 480) } }, { PixelFormat(1), { SizeRange(640, 480, 640, 480) } },
{ 2, { SizeRange(640, 480, 800, 600, 8, 8) } }, { PixelFormat(2), { SizeRange(640, 480, 800, 600, 8, 8) } },
{ 3, { SizeRange(640, 480, 800, 600, 16, 16) } }, { PixelFormat(3), { SizeRange(640, 480, 800, 600, 16, 16) } },
{ 4, { SizeRange(128, 128, 4096, 4096, 128, 128) } }, { PixelFormat(4), { SizeRange(128, 128, 4096, 4096, 128, 128) } },
}); });
if (testSizes("range 1", range.sizes(1), { Size(640, 480) })) if (testSizes("range 1", range.sizes(PixelFormat(1)), { Size(640, 480) }))
return TestFail; return TestFail;
if (testSizes("range 2", range.sizes(2), { if (testSizes("range 2", range.sizes(PixelFormat(2)), {
Size(640, 480), Size(720, 480), Size(640, 480), Size(720, 480),
Size(720, 576), Size(768, 480), Size(720, 576), Size(768, 480),
Size(800, 600) })) Size(800, 600) }))
return TestFail; return TestFail;
if (testSizes("range 3", range.sizes(3), { if (testSizes("range 3", range.sizes(PixelFormat(3)), {
Size(640, 480), Size(720, 480), Size(640, 480), Size(720, 480),
Size(720, 576), Size(768, 480) })) Size(720, 576), Size(768, 480) }))
return TestFail; return TestFail;
if (testSizes("range 4", range.sizes(4), { if (testSizes("range 4", range.sizes(PixelFormat(4)), {
Size(1024, 768), Size(1280, 1024), Size(1024, 768), Size(1280, 1024),
Size(2048, 1152), Size(2048, 1536), Size(2048, 1152), Size(2048, 1536),
Size(2560, 2048), Size(3200, 2048), })) Size(2560, 2048), Size(3200, 2048), }))

2
test/v4l2_videodevice/buffer_cache.cpp
View file

@ -142,7 +142,7 @@ public:
const unsigned int numBuffers = 8; const unsigned int numBuffers = 8;
StreamConfiguration cfg; StreamConfiguration cfg;
cfg.pixelFormat = DRM_FORMAT_YUYV; cfg.pixelFormat = PixelFormat(DRM_FORMAT_YUYV);
cfg.size = Size(600, 800); cfg.size = Size(600, 800);
cfg.bufferCount = numBuffers; cfg.bufferCount = numBuffers;