Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-19 10:25:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

v4l2: camera_proxy: Rationalize arguments to format helpers

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2020-01-05 04:03:37 +02:00
parent 7088041a80
commit aff0b680aa
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/v4l2/v4l2_camera_proxy.cpp
View file

@ -509,7 +509,7 @@ int V4L2CameraProxy::ioctl(unsigned long request, void *arg)
} }
/* \todo make libcamera export these */ /* \todo make libcamera export these */
int V4L2CameraProxy::bplMultiplier(unsigned int format) unsigned int V4L2CameraProxy::bplMultiplier(uint32_t format)
{ {
switch (format) { switch (format) {
case V4L2_PIX_FMT_NV12: case V4L2_PIX_FMT_NV12:
@ -534,8 +534,8 @@ int V4L2CameraProxy::bplMultiplier(unsigned int format)
}; };
} }
int V4L2CameraProxy::imageSize(unsigned int format, unsigned int V4L2CameraProxy::imageSize(uint32_t format, unsigned int width,
unsigned int width, unsigned int height) unsigned int height)
{ {
switch (format) { switch (format) {
case V4L2_PIX_FMT_NV12: 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. */ /* RGB formats. */
case V4L2_PIX_FMT_RGB24: case V4L2_PIX_FMT_RGB24:
return DRM_FORMAT_BGR888; return DRM_FORMAT_BGR888;
@ -597,13 +597,13 @@ unsigned int V4L2CameraProxy::v4l2ToDrm(unsigned int pixelformat)
case V4L2_PIX_FMT_NV42: case V4L2_PIX_FMT_NV42:
return DRM_FORMAT_NV42; return DRM_FORMAT_NV42;
default: default:
return pixelformat; return format;
}; };
} }
unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat) uint32_t V4L2CameraProxy::drmToV4L2(PixelFormat format)
{ {
switch (pixelformat) { switch (format) {
/* RGB formats. */ /* RGB formats. */
case DRM_FORMAT_BGR888: case DRM_FORMAT_BGR888:
return V4L2_PIX_FMT_RGB24; return V4L2_PIX_FMT_RGB24;
@ -636,6 +636,6 @@ unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat)
case DRM_FORMAT_NV42: case DRM_FORMAT_NV42:
return V4L2_PIX_FMT_NV42; return V4L2_PIX_FMT_NV42;
default: default:
return pixelformat; return format;
} }
} }

8
src/v4l2/v4l2_camera_proxy.h
View file

@ -54,12 +54,12 @@ private:
int vidioc_streamon(int *arg); int vidioc_streamon(int *arg);
int vidioc_streamoff(int *arg); int vidioc_streamoff(int *arg);
static int bplMultiplier(unsigned int format); static unsigned int bplMultiplier(uint32_t format);
static int imageSize(unsigned int format, unsigned int width, static unsigned int imageSize(uint32_t format, unsigned int width,
unsigned int height); unsigned int height);
static unsigned int v4l2ToDrm(unsigned int pixelformat); static PixelFormat v4l2ToDrm(uint32_t format);
static unsigned int drmToV4L2(unsigned int pixelformat); static uint32_t drmToV4L2(PixelFormat format);
unsigned int refcount_; unsigned int refcount_;
unsigned int index_; unsigned int index_;