summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2019-05-24 09:06:58 +0200
committerJacopo Mondi <jacopo@jmondi.org>2019-06-02 14:50:10 +0200
commit629e9301c518624960779399714907b1dbecaf5b (patch)
tree69fd6de7ea2b40b2cf5b549c6b2c60623bc330f3
parent81e004e0ffa41ad595c65d9ebad2a1fdf729117b (diff)
libcamera: v4l2_device: Add META support in g/s_fmt
Add two operations to set and get format on devices implementing the V4L2 Metadata Interface, identified by the META_OUTPUT or META_CAPTURE capabilities. While at it, sort get/setFormat operations alphabetically and unify their style (eg. no empty line before ioctl). Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/libcamera/include/v4l2_device.h7
-rw-r--r--src/libcamera/v4l2_device.cpp109
2 files changed, 90 insertions, 26 deletions
diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h
index cecafa15..bdecc087 100644
--- a/src/libcamera/include/v4l2_device.h
+++ b/src/libcamera/include/v4l2_device.h
@@ -150,12 +150,15 @@ protected:
std::string logPrefix() const;
private:
- int getFormatSingleplane(V4L2DeviceFormat *format);
- int setFormatSingleplane(V4L2DeviceFormat *format);
+ int getFormatMeta(V4L2DeviceFormat *format);
+ int setFormatMeta(V4L2DeviceFormat *format);
int getFormatMultiplane(V4L2DeviceFormat *format);
int setFormatMultiplane(V4L2DeviceFormat *format);
+ int getFormatSingleplane(V4L2DeviceFormat *format);
+ int setFormatSingleplane(V4L2DeviceFormat *format);
+
int requestBuffers(unsigned int count);
int createPlane(Buffer *buffer, unsigned int plane,
unsigned int length);
diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp
index e42f6ef0..0821bd75 100644
--- a/src/libcamera/v4l2_device.cpp
+++ b/src/libcamera/v4l2_device.cpp
@@ -428,8 +428,12 @@ std::string V4L2Device::logPrefix() const
*/
int V4L2Device::getFormat(V4L2DeviceFormat *format)
{
- return caps_.isMultiplanar() ? getFormatMultiplane(format) :
- getFormatSingleplane(format);
+ if (caps_.isMeta())
+ return getFormatMeta(format);
+ else if (caps_.isMultiplanar())
+ return getFormatMultiplane(format);
+ else
+ return getFormatSingleplane(format);
}
/**
@@ -443,14 +447,18 @@ int V4L2Device::getFormat(V4L2DeviceFormat *format)
*/
int V4L2Device::setFormat(V4L2DeviceFormat *format)
{
- return caps_.isMultiplanar() ? setFormatMultiplane(format) :
- setFormatSingleplane(format);
+ if (caps_.isMeta())
+ return setFormatMeta(format);
+ else if (caps_.isMultiplanar())
+ return setFormatMultiplane(format);
+ else
+ return setFormatSingleplane(format);
}
-int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format)
+int V4L2Device::getFormatMeta(V4L2DeviceFormat *format)
{
struct v4l2_format v4l2Format = {};
- struct v4l2_pix_format *pix = &v4l2Format.fmt.pix;
+ struct v4l2_meta_format *pix = &v4l2Format.fmt.meta;
int ret;
v4l2Format.type = bufferType_;
@@ -461,29 +469,25 @@ int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format)
return ret;
}
- format->size.width = pix->width;
- format->size.height = pix->height;
- format->fourcc = pix->pixelformat;
+ format->size.width = 0;
+ format->size.height = 0;
+ format->fourcc = pix->dataformat;
format->planesCount = 1;
- format->planes[0].bpl = pix->bytesperline;
- format->planes[0].size = pix->sizeimage;
+ format->planes[0].bpl = pix->buffersize;
+ format->planes[0].size = pix->buffersize;
return 0;
}
-int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format)
+int V4L2Device::setFormatMeta(V4L2DeviceFormat *format)
{
struct v4l2_format v4l2Format = {};
- struct v4l2_pix_format *pix = &v4l2Format.fmt.pix;
+ struct v4l2_meta_format *pix = &v4l2Format.fmt.meta;
int ret;
v4l2Format.type = bufferType_;
- pix->width = format->size.width;
- pix->height = format->size.height;
- pix->pixelformat = format->fourcc;
- pix->bytesperline = format->planes[0].bpl;
- pix->field = V4L2_FIELD_NONE;
-
+ pix->dataformat = format->fourcc;
+ pix->buffersize = format->planes[0].size;
ret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format);
if (ret) {
ret = -errno;
@@ -495,12 +499,12 @@ int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format)
* Return to caller the format actually applied on the device,
* which might differ from the requested one.
*/
- format->size.width = pix->width;
- format->size.height = pix->height;
- format->fourcc = pix->pixelformat;
+ format->size.width = 0;
+ format->size.height = 0;
+ format->fourcc = format->fourcc;
format->planesCount = 1;
- format->planes[0].bpl = pix->bytesperline;
- format->planes[0].size = pix->sizeimage;
+ format->planes[0].bpl = pix->buffersize;
+ format->planes[0].size = pix->buffersize;
return 0;
}
@@ -573,6 +577,63 @@ int V4L2Device::setFormatMultiplane(V4L2DeviceFormat *format)
return 0;
}
+int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format)
+{
+ struct v4l2_format v4l2Format = {};
+ struct v4l2_pix_format *pix = &v4l2Format.fmt.pix;
+ int ret;
+
+ v4l2Format.type = bufferType_;
+ ret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Format);
+ if (ret) {
+ ret = -errno;
+ LOG(V4L2, Error) << "Unable to get format: " << strerror(-ret);
+ return ret;
+ }
+
+ format->size.width = pix->width;
+ format->size.height = pix->height;
+ format->fourcc = pix->pixelformat;
+ format->planesCount = 1;
+ format->planes[0].bpl = pix->bytesperline;
+ format->planes[0].size = pix->sizeimage;
+
+ return 0;
+}
+
+int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format)
+{
+ struct v4l2_format v4l2Format = {};
+ struct v4l2_pix_format *pix = &v4l2Format.fmt.pix;
+ int ret;
+
+ v4l2Format.type = bufferType_;
+ pix->width = format->size.width;
+ pix->height = format->size.height;
+ pix->pixelformat = format->fourcc;
+ pix->bytesperline = format->planes[0].bpl;
+ pix->field = V4L2_FIELD_NONE;
+ ret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format);
+ if (ret) {
+ ret = -errno;
+ LOG(V4L2, Error) << "Unable to set format: " << strerror(-ret);
+ return ret;
+ }
+
+ /*
+ * Return to caller the format actually applied on the device,
+ * which might differ from the requested one.
+ */
+ format->size.width = pix->width;
+ format->size.height = pix->height;
+ format->fourcc = pix->pixelformat;
+ format->planesCount = 1;
+ format->planes[0].bpl = pix->bytesperline;
+ format->planes[0].size = pix->sizeimage;
+
+ return 0;
+}
+
int V4L2Device::requestBuffers(unsigned int count)
{
struct v4l2_requestbuffers rb = {};