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

libcamera: v4l2_videodevice: Rename toV4L2Fourcc to toV4L2PixelFormat

Browse source 
Now that the functions return a V4L2PixelFormat, adapt their name
accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2020-03-17 01:17:29 +02:00
parent a7f24a8d9a
commit 6015d9702e
7 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -229,9 +229,9 @@ public:
const std::string &entity); const std::string &entity);
static PixelFormat toPixelFormat(V4L2PixelFormat v4l2Fourcc); static PixelFormat toPixelFormat(V4L2PixelFormat v4l2Fourcc);
V4L2PixelFormat toV4L2Fourcc(const PixelFormat &pixelFormat); V4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat);
static V4L2PixelFormat toV4L2Fourcc(const PixelFormat &pixelFormat, static V4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat,
bool multiplanar); bool multiplanar);
protected: protected:
std::string logPrefix() const; std::string logPrefix() const;

2
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -1078,7 +1078,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,
return 0; return 0;
V4L2DeviceFormat outputFormat = {}; V4L2DeviceFormat outputFormat = {};
outputFormat.fourcc = dev->toV4L2Fourcc(PixelFormat(DRM_FORMAT_NV12)); outputFormat.fourcc = dev->toV4L2PixelFormat(PixelFormat(DRM_FORMAT_NV12));
outputFormat.size = cfg.size; outputFormat.size = cfg.size;
outputFormat.planesCount = 2; outputFormat.planesCount = 2;

4
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View file

@ -626,7 +626,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
LOG(RkISP1, Debug) << "Resizer output pad configured with " << format.toString(); LOG(RkISP1, Debug) << "Resizer output pad configured with " << format.toString();
V4L2DeviceFormat outputFormat = {}; V4L2DeviceFormat outputFormat = {};
outputFormat.fourcc = video_->toV4L2Fourcc(cfg.pixelFormat); outputFormat.fourcc = video_->toV4L2PixelFormat(cfg.pixelFormat);
outputFormat.size = cfg.size; outputFormat.size = cfg.size;
outputFormat.planesCount = 2; outputFormat.planesCount = 2;
@ -635,7 +635,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
return ret; return ret;
if (outputFormat.size != cfg.size || if (outputFormat.size != cfg.size ||
outputFormat.fourcc != video_->toV4L2Fourcc(cfg.pixelFormat)) { outputFormat.fourcc != video_->toV4L2PixelFormat(cfg.pixelFormat)) {
LOG(RkISP1, Error) LOG(RkISP1, Error)
<< "Unable to configure capture in " << cfg.toString(); << "Unable to configure capture in " << cfg.toString();
return -EINVAL; return -EINVAL;

4
src/libcamera/pipeline/uvcvideo.cpp
View file

@ -187,7 +187,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)
int ret; int ret;
V4L2DeviceFormat format = {}; V4L2DeviceFormat format = {};
format.fourcc = data->video_->toV4L2Fourcc(cfg.pixelFormat); format.fourcc = data->video_->toV4L2PixelFormat(cfg.pixelFormat);
format.size = cfg.size; format.size = cfg.size;
ret = data->video_->setFormat(&format); ret = data->video_->setFormat(&format);
@ -195,7 +195,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)
return ret; return ret;
if (format.size != cfg.size || if (format.size != cfg.size ||
format.fourcc != data->video_->toV4L2Fourcc(cfg.pixelFormat)) format.fourcc != data->video_->toV4L2PixelFormat(cfg.pixelFormat))
return -EINVAL; return -EINVAL;
cfg.setStream(&data->stream_); cfg.setStream(&data->stream_);

4
src/libcamera/pipeline/vimc.cpp
View file

@ -229,7 +229,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)
return ret; return ret;
V4L2DeviceFormat format = {}; V4L2DeviceFormat format = {};
format.fourcc = data->video_->toV4L2Fourcc(cfg.pixelFormat); format.fourcc = data->video_->toV4L2PixelFormat(cfg.pixelFormat);
format.size = cfg.size; format.size = cfg.size;
ret = data->video_->setFormat(&format); ret = data->video_->setFormat(&format);
@ -237,7 +237,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)
return ret; return ret;
if (format.size != cfg.size || if (format.size != cfg.size ||
format.fourcc != data->video_->toV4L2Fourcc(cfg.pixelFormat)) format.fourcc != data->video_->toV4L2PixelFormat(cfg.pixelFormat))
return -EINVAL; return -EINVAL;
/* /*

8
src/libcamera/v4l2_videodevice.cpp
View file

@ -1689,9 +1689,9 @@ PixelFormat V4L2VideoDevice::toPixelFormat(V4L2PixelFormat v4l2Fourcc)
* *
* \return The V4L2_PIX_FMT_* pixel format code corresponding to \a pixelFormat * \return The V4L2_PIX_FMT_* pixel format code corresponding to \a pixelFormat
*/ */
V4L2PixelFormat V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat) V4L2PixelFormat V4L2VideoDevice::toV4L2PixelFormat(const PixelFormat &pixelFormat)
{ {
return V4L2VideoDevice::toV4L2Fourcc(pixelFormat, caps_.isMultiplanar()); return toV4L2PixelFormat(pixelFormat, caps_.isMultiplanar());
} }
/** /**
@ -1707,8 +1707,8 @@ V4L2PixelFormat V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat)
* *
* \return The V4L2_PIX_FMT_* pixel format code corresponding to \a pixelFormat * \return The V4L2_PIX_FMT_* pixel format code corresponding to \a pixelFormat
*/ */
V4L2PixelFormat V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat, V4L2PixelFormat V4L2VideoDevice::toV4L2PixelFormat(const PixelFormat &pixelFormat,
bool multiplanar) bool multiplanar)
{ {
switch (pixelFormat) { switch (pixelFormat) {
/* RGB formats. */ /* RGB formats. */

3
test/libtest/buffer_source.cpp
View file

@ -70,7 +70,8 @@ int BufferSource::allocate(const StreamConfiguration &config)
} }
format.size = config.size; format.size = config.size;
format.fourcc = V4L2VideoDevice::toV4L2Fourcc(config.pixelFormat, false); format.fourcc = V4L2VideoDevice::toV4L2PixelFormat(config.pixelFormat,
false);
if (video->setFormat(&format)) { if (video->setFormat(&format)) {
std::cout << "Failed to set format on output device" << std::endl; std::cout << "Failed to set format on output device" << std::endl;
return TestFail; return TestFail;