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

libcamera: PixelFormat: Mark all function arguments of type PixelFormat as const reference

Browse source 
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 <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2020-03-17 04:29:06 +01:00
parent 718f5e99a9
commit aaf1ce50f9
12 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/libcamera/stream.h
View file

@ -28,9 +28,9 @@ public:
StreamFormats(const std::map<PixelFormat, std::vector<SizeRange>> &formats);
std::vector<PixelFormat> pixelformats() const;
std::vector<Size> sizes(PixelFormat pixelformat) const;
std::vector<Size> sizes(const PixelFormat &pixelformat) const;
SizeRange range(PixelFormat pixelformat) const;
SizeRange range(const PixelFormat &pixelformat) const;
private:
std::map<PixelFormat, std::vector<SizeRange>> formats_;

5
src/libcamera/include/v4l2_videodevice.h
View file

@ -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;

4
src/libcamera/stream.cpp
View file

@ -127,7 +127,7 @@ std::vector<PixelFormat> StreamFormats::pixelformats() const
*
* \return A list of frame sizes or an empty list on error
*/
std::vector<Size> StreamFormats::sizes(PixelFormat pixelformat) const
std::vector<Size> StreamFormats::sizes(const PixelFormat &pixelformat) const
{
/*
* Sizes to try and extract from ranges.
@ -240,7 +240,7 @@ std::vector<Size> 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())

5
src/libcamera/v4l2_videodevice.cpp
View file

@ -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. */

4
src/qcam/format_converter.cpp
View file

@ -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:

2
src/qcam/format_converter.h
View file

@ -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);

4
src/qcam/viewfinder.cpp
View file

@ -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;

2
src/qcam/viewfinder.h
View file

@ -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);

2
src/v4l2/v4l2_camera.cpp
View file

@ -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);

2
src/v4l2/v4l2_camera.h
View file

@ -43,7 +43,7 @@ public:
std::vector<Buffer> completedBuffers();
int configure(StreamConfiguration *streamConfigOut,
const Size &size, PixelFormat pixelformat,
const Size &size, const PixelFormat &pixelformat,
unsigned int bufferCount);
int allocBuffers(unsigned int count);

2
src/v4l2/v4l2_camera_proxy.cpp
View file

@ -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) {

2
src/v4l2/v4l2_camera_proxy.h
View file

@ -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_;