summaryrefslogtreecommitdiff
path: root/src/v4l2
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-01-05 04:03:37 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-01-07 22:35:26 +0200
commitaff0b680aa9b05d5854ef1c1fb4f268f26383b02 (patch)
tree67f007556b878d5fafcd3bb94627a27cf405df2d /src/v4l2
parent7088041a805d3be8a1d8b7d4c28cc1cecccf4396 (diff)
v4l2: camera_proxy: Rationalize arguments to format helpers
To clarify code, adopt the following rules for format helpers: - All variables representing V4L2 pixel formats shall use uint32_t - All variables representing DRM pixel formats shall use PixelFormat - Functions returning positive values only shall not have a signed return type Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'src/v4l2')
-rw-r--r--src/v4l2/v4l2_camera_proxy.cpp18
-rw-r--r--src/v4l2/v4l2_camera_proxy.h10
2 files changed, 14 insertions, 14 deletions
diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index 2eeb1239..c7ef4d51 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -509,7 +509,7 @@ int V4L2CameraProxy::ioctl(unsigned long request, void *arg)
}
/* \todo make libcamera export these */
-int V4L2CameraProxy::bplMultiplier(unsigned int format)
+unsigned int V4L2CameraProxy::bplMultiplier(uint32_t format)
{
switch (format) {
case V4L2_PIX_FMT_NV12:
@@ -534,8 +534,8 @@ int V4L2CameraProxy::bplMultiplier(unsigned int format)
};
}
-int V4L2CameraProxy::imageSize(unsigned int format,
- unsigned int width, unsigned int height)
+unsigned int V4L2CameraProxy::imageSize(uint32_t format, unsigned int width,
+ unsigned int height)
{
switch (format) {
case V4L2_PIX_FMT_NV12:
@@ -562,9 +562,9 @@ int V4L2CameraProxy::imageSize(unsigned int format,
};
}
-unsigned int V4L2CameraProxy::v4l2ToDrm(unsigned int pixelformat)
+PixelFormat V4L2CameraProxy::v4l2ToDrm(uint32_t format)
{
- switch (pixelformat) {
+ switch (format) {
/* RGB formats. */
case V4L2_PIX_FMT_RGB24:
return DRM_FORMAT_BGR888;
@@ -597,13 +597,13 @@ unsigned int V4L2CameraProxy::v4l2ToDrm(unsigned int pixelformat)
case V4L2_PIX_FMT_NV42:
return DRM_FORMAT_NV42;
default:
- return pixelformat;
+ return format;
};
}
-unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat)
+uint32_t V4L2CameraProxy::drmToV4L2(PixelFormat format)
{
- switch (pixelformat) {
+ switch (format) {
/* RGB formats. */
case DRM_FORMAT_BGR888:
return V4L2_PIX_FMT_RGB24;
@@ -636,6 +636,6 @@ unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat)
case DRM_FORMAT_NV42:
return V4L2_PIX_FMT_NV42;
default:
- return pixelformat;
+ return format;
}
}
diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h
index bef0f0af..3d702084 100644
--- a/src/v4l2/v4l2_camera_proxy.h
+++ b/src/v4l2/v4l2_camera_proxy.h
@@ -54,12 +54,12 @@ private:
int vidioc_streamon(int *arg);
int vidioc_streamoff(int *arg);
- static int bplMultiplier(unsigned int format);
- static int imageSize(unsigned int format, unsigned int width,
- unsigned int height);
+ static unsigned int bplMultiplier(uint32_t format);
+ static unsigned int imageSize(uint32_t format, unsigned int width,
+ unsigned int height);
- static unsigned int v4l2ToDrm(unsigned int pixelformat);
- static unsigned int drmToV4L2(unsigned int pixelformat);
+ static PixelFormat v4l2ToDrm(uint32_t format);
+ static uint32_t drmToV4L2(PixelFormat format);
unsigned int refcount_;
unsigned int index_;