PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: v4l2_videodevice: Re-group operations

Browse Source 
Group together operations to enumerate formats and operations to handle
memory handling, alternating public and private operations but
respecting the ordering within each group. Cosmetic change only.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Jacopo Mondi
2019-06-28 10:45:55 +02:00
parent 851bf31df8
commit 79e03cdf40
2 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,13 +160,13 @@ private:
int getFormatSingleplane(V4L2DeviceFormat *format);
int setFormatSingleplane(V4L2DeviceFormat *format);
std::vector<unsigned int> enumPixelformats();
std::vector<SizeRange> enumSizes(unsigned int pixelFormat);
int requestBuffers(unsigned int count);
int createPlane(Buffer *buffer, unsigned int plane,
unsigned int length);
std::vector<unsigned int> enumPixelformats();
std::vector<SizeRange> enumSizes(unsigned int pixelFormat);
Buffer *dequeueBuffer();
void bufferAvailable(EventNotifier *notifier);

170
src/libcamera/v4l2_videodevice.cpp
View File

@@ -627,6 +627,91 @@ ImageFormats V4L2VideoDevice::formats()
return formats;
}
std::vector<unsigned int> V4L2VideoDevice::enumPixelformats()
{
std::vector<unsigned int> formats;
int ret;
for (unsigned int index = 0; ; index++) {
struct v4l2_fmtdesc pixelformatEnum = {};
pixelformatEnum.index = index;
pixelformatEnum.type = bufferType_;
ret = ioctl(VIDIOC_ENUM_FMT, &pixelformatEnum);
if (ret)
break;
formats.push_back(pixelformatEnum.pixelformat);
}
if (ret && ret != -EINVAL) {
LOG(V4L2, Error)
<< "Unable to enumerate pixel formats: "
<< strerror(-ret);
return {};
}
return formats;
}
std::vector<SizeRange> V4L2VideoDevice::enumSizes(unsigned int pixelFormat)
{
std::vector<SizeRange> sizes;
int ret;
for (unsigned int index = 0;; index++) {
struct v4l2_frmsizeenum frameSize = {};
frameSize.index = index;
frameSize.pixel_format = pixelFormat;
ret = ioctl(VIDIOC_ENUM_FRAMESIZES, &frameSize);
if (ret)
break;
if (index != 0 &&
frameSize.type != V4L2_FRMSIZE_TYPE_DISCRETE) {
LOG(V4L2, Error)
<< "Non-zero index for non discrete type";
return {};
}
switch (frameSize.type) {
case V4L2_FRMSIZE_TYPE_DISCRETE:
sizes.emplace_back(frameSize.discrete.width,
frameSize.discrete.height);
break;
case V4L2_FRMSIZE_TYPE_CONTINUOUS:
sizes.emplace_back(frameSize.stepwise.min_width,
frameSize.stepwise.min_height,
frameSize.stepwise.max_width,
frameSize.stepwise.max_height);
break;
case V4L2_FRMSIZE_TYPE_STEPWISE:
sizes.emplace_back(frameSize.stepwise.min_width,
frameSize.stepwise.min_height,
frameSize.stepwise.max_width,
frameSize.stepwise.max_height,
frameSize.stepwise.step_width,
frameSize.stepwise.step_height);
break;
default:
LOG(V4L2, Error)
<< "Unknown VIDIOC_ENUM_FRAMESIZES type "
<< frameSize.type;
return {};
}
}
if (ret && ret != -EINVAL) {
LOG(V4L2, Error)
<< "Unable to enumerate frame sizes: "
<< strerror(-ret);
return {};
}
return sizes;
}
int V4L2VideoDevice::requestBuffers(unsigned int count)
{
struct v4l2_requestbuffers rb = {};
@@ -754,91 +839,6 @@ int V4L2VideoDevice::createPlane(Buffer *buffer, unsigned int planeIndex,
return 0;
}
std::vector<unsigned int> V4L2VideoDevice::enumPixelformats()
{
std::vector<unsigned int> formats;
int ret;
for (unsigned int index = 0; ; index++) {
struct v4l2_fmtdesc pixelformatEnum = {};
pixelformatEnum.index = index;
pixelformatEnum.type = bufferType_;
ret = ioctl(VIDIOC_ENUM_FMT, &pixelformatEnum);
if (ret)
break;
formats.push_back(pixelformatEnum.pixelformat);
}
if (ret && ret != -EINVAL) {
LOG(V4L2, Error)
<< "Unable to enumerate pixel formats: "
<< strerror(-ret);
return {};
}
return formats;
}
std::vector<SizeRange> V4L2VideoDevice::enumSizes(unsigned int pixelFormat)
{
std::vector<SizeRange> sizes;
int ret;
for (unsigned int index = 0;; index++) {
struct v4l2_frmsizeenum frameSize = {};
frameSize.index = index;
frameSize.pixel_format = pixelFormat;
ret = ioctl(VIDIOC_ENUM_FRAMESIZES, &frameSize);
if (ret)
break;
if (index != 0 &&
frameSize.type != V4L2_FRMSIZE_TYPE_DISCRETE) {
LOG(V4L2, Error)
<< "Non-zero index for non discrete type";
return {};
}
switch (frameSize.type) {
case V4L2_FRMSIZE_TYPE_DISCRETE:
sizes.emplace_back(frameSize.discrete.width,
frameSize.discrete.height);
break;
case V4L2_FRMSIZE_TYPE_CONTINUOUS:
sizes.emplace_back(frameSize.stepwise.min_width,
frameSize.stepwise.min_height,
frameSize.stepwise.max_width,
frameSize.stepwise.max_height);
break;
case V4L2_FRMSIZE_TYPE_STEPWISE:
sizes.emplace_back(frameSize.stepwise.min_width,
frameSize.stepwise.min_height,
frameSize.stepwise.max_width,
frameSize.stepwise.max_height,
frameSize.stepwise.step_width,
frameSize.stepwise.step_height);
break;
default:
LOG(V4L2, Error)
<< "Unknown VIDIOC_ENUM_FRAMESIZES type "
<< frameSize.type;
return {};
}
}
if (ret && ret != -EINVAL) {
LOG(V4L2, Error)
<< "Unable to enumerate frame sizes: "
<< strerror(-ret);
return {};
}
return sizes;
}
/**
* \brief Import the externally allocated \a pool of buffers
* \param[in] pool BufferPool of buffers to import