From aaf1ce50f9602c838428c8a089e28b83666b759b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Tue, 17 Mar 2020 04:29:06 +0100 Subject: libcamera: PixelFormat: Mark all function arguments of type PixelFormat as const reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PixelFormat was previously an alias for unsigned int but is now a class. Make all functions taking PixelFormat do so as a const reference. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- include/libcamera/stream.h | 4 ++-- src/libcamera/include/v4l2_videodevice.h | 5 +++-- src/libcamera/stream.cpp | 4 ++-- src/libcamera/v4l2_videodevice.cpp | 5 +++-- src/qcam/format_converter.cpp | 4 ++-- src/qcam/format_converter.h | 2 +- src/qcam/viewfinder.cpp | 4 ++-- src/qcam/viewfinder.h | 2 +- src/v4l2/v4l2_camera.cpp | 2 +- src/v4l2/v4l2_camera.h | 2 +- src/v4l2/v4l2_camera_proxy.cpp | 2 +- src/v4l2/v4l2_camera_proxy.h | 2 +- 12 files changed, 20 insertions(+), 18 deletions(-) diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h index 29a8030d..b1441f8e 100644 --- a/include/libcamera/stream.h +++ b/include/libcamera/stream.h @@ -28,9 +28,9 @@ public: StreamFormats(const std::map> &formats); std::vector pixelformats() const; - std::vector sizes(PixelFormat pixelformat) const; + std::vector sizes(const PixelFormat &pixelformat) const; - SizeRange range(PixelFormat pixelformat) const; + SizeRange range(const PixelFormat &pixelformat) const; private: std::map> formats_; diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h index d051c906..eaf9ceda 100644 --- a/src/libcamera/include/v4l2_videodevice.h +++ b/src/libcamera/include/v4l2_videodevice.h @@ -204,8 +204,9 @@ public: const std::string &entity); static PixelFormat toPixelFormat(uint32_t v4l2Fourcc); - uint32_t toV4L2Fourcc(PixelFormat pixelFormat); - static uint32_t toV4L2Fourcc(PixelFormat pixelFormat, bool multiplanar); + uint32_t toV4L2Fourcc(const PixelFormat &pixelFormat); + static uint32_t toV4L2Fourcc(const PixelFormat &pixelFormat, + bool multiplanar); protected: std::string logPrefix() const; diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index 0716de38..e61484ca 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -127,7 +127,7 @@ std::vector StreamFormats::pixelformats() const * * \return A list of frame sizes or an empty list on error */ -std::vector StreamFormats::sizes(PixelFormat pixelformat) const +std::vector StreamFormats::sizes(const PixelFormat &pixelformat) const { /* * Sizes to try and extract from ranges. @@ -240,7 +240,7 @@ std::vector StreamFormats::sizes(PixelFormat pixelformat) const * * \return A range of valid image sizes or an empty range on error */ -SizeRange StreamFormats::range(PixelFormat pixelformat) const +SizeRange StreamFormats::range(const PixelFormat &pixelformat) const { auto const it = formats_.find(pixelformat); if (it == formats_.end()) diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 455675fd..70dd72e6 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1487,7 +1487,7 @@ PixelFormat V4L2VideoDevice::toPixelFormat(uint32_t v4l2Fourcc) * * \return The V4L2_PIX_FMT_* pixel format code corresponding to \a pixelFormat */ -uint32_t V4L2VideoDevice::toV4L2Fourcc(PixelFormat pixelFormat) +uint32_t V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat) { return V4L2VideoDevice::toV4L2Fourcc(pixelFormat, caps_.isMultiplanar()); } @@ -1505,7 +1505,8 @@ uint32_t V4L2VideoDevice::toV4L2Fourcc(PixelFormat pixelFormat) * * \return The V4L2_PIX_FMT_* pixel format code corresponding to \a pixelFormat */ -uint32_t V4L2VideoDevice::toV4L2Fourcc(PixelFormat pixelFormat, bool multiplanar) +uint32_t V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat, + bool multiplanar) { switch (pixelFormat) { /* RGB formats. */ diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index 7b8ad77c..483f7c1e 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -25,8 +25,8 @@ #define CLIP(x) CLAMP(x,0,255) #endif -int FormatConverter::configure(libcamera::PixelFormat format, unsigned int width, - unsigned int height) +int FormatConverter::configure(const libcamera::PixelFormat &format, + unsigned int width, unsigned int height) { switch (format) { case DRM_FORMAT_NV12: diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h index ff488b99..96bde238 100644 --- a/src/qcam/format_converter.h +++ b/src/qcam/format_converter.h @@ -16,7 +16,7 @@ class QImage; class FormatConverter { public: - int configure(libcamera::PixelFormat format, unsigned int width, + int configure(const libcamera::PixelFormat &format, unsigned int width, unsigned int height); void convert(const unsigned char *src, size_t size, QImage *dst); diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index 0ebb8edd..e9d5cc1e 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -44,8 +44,8 @@ QImage ViewFinder::getCurrentImage() return image_->copy(); } -int ViewFinder::setFormat(libcamera::PixelFormat format, unsigned int width, - unsigned int height) +int ViewFinder::setFormat(const libcamera::PixelFormat &format, + unsigned int width, unsigned int height) { int ret; diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index 2668aa44..0549f038 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -22,7 +22,7 @@ public: ViewFinder(QWidget *parent); ~ViewFinder(); - int setFormat(libcamera::PixelFormat format, unsigned int width, + int setFormat(const libcamera::PixelFormat &format, unsigned int width, unsigned int height); void display(const unsigned char *rgb, size_t size); diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index e7018b56..b1463559 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -88,7 +88,7 @@ void V4L2Camera::requestComplete(Request *request) } int V4L2Camera::configure(StreamConfiguration *streamConfigOut, - const Size &size, PixelFormat pixelformat, + const Size &size, const PixelFormat &pixelformat, unsigned int bufferCount) { StreamConfiguration &streamConfig = config_->at(0); diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index 37bd3584..130995d9 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -43,7 +43,7 @@ public: std::vector completedBuffers(); int configure(StreamConfiguration *streamConfigOut, - const Size &size, PixelFormat pixelformat, + const Size &size, const PixelFormat &pixelformat, unsigned int bufferCount); int allocBuffers(unsigned int count); diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 05ba0ff9..47d0528b 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -598,7 +598,7 @@ PixelFormat V4L2CameraProxy::v4l2ToDrm(uint32_t format) return info->format; } -uint32_t V4L2CameraProxy::drmToV4L2(PixelFormat format) +uint32_t V4L2CameraProxy::drmToV4L2(const PixelFormat &format) { auto info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(), [format](const PixelFormatInfo &info) { diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index c8e61adf..e15b230d 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -60,7 +60,7 @@ private: unsigned int height); static PixelFormat v4l2ToDrm(uint32_t format); - static uint32_t drmToV4L2(PixelFormat format); + static uint32_t drmToV4L2(const PixelFormat &format); unsigned int refcount_; unsigned int index_; -- cgit v1.2.1