diff options
| -rw-r--r-- | src/v4l2/v4l2_camera_proxy.cpp | 18 | ||||
| -rw-r--r-- | src/v4l2/v4l2_camera_proxy.h | 10 |
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_; |