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

libcamera: v4l2_device: Add support for META_OUTPUT

Browse source 
Add support for output devices that expose the META_OUTPUT capabilities.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Jacopo Mondi 2019-05-24 08:47:51 +02:00
parent 74a56fe51a
commit 81e004e0ff
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libcamera/include/v4l2_device.h
View file

@ -59,7 +59,8 @@ struct V4L2Capability final : v4l2_capability {
bool isOutput() const bool isOutput() const
{ {
return device_caps() & (V4L2_CAP_VIDEO_OUTPUT | return device_caps() & (V4L2_CAP_VIDEO_OUTPUT |
V4L2_CAP_VIDEO_OUTPUT_MPLANE); V4L2_CAP_VIDEO_OUTPUT_MPLANE |
V4L2_CAP_META_OUTPUT);
} }
bool isVideo() const bool isVideo() const
{ {
@ -70,7 +71,8 @@ struct V4L2Capability final : v4l2_capability {
} }
bool isMeta() const bool isMeta() const
{ {
return device_caps() & V4L2_CAP_META_CAPTURE; return device_caps() & (V4L2_CAP_META_CAPTURE |
V4L2_CAP_META_OUTPUT);
} }
bool isVideoCapture() const bool isVideoCapture() const
{ {
@ -84,6 +86,10 @@ struct V4L2Capability final : v4l2_capability {
{ {
return isMeta() && isCapture(); return isMeta() && isCapture();
} }
bool isMetaOutput() const
{
return isMeta() && isOutput();
}
bool hasStreaming() const bool hasStreaming() const
{ {
return device_caps() & V4L2_CAP_STREAMING; return device_caps() & V4L2_CAP_STREAMING;

9
src/libcamera/v4l2_device.cpp
View file

@ -116,6 +116,12 @@ LOG_DEFINE_CATEGORY(V4L2)
* \return True if the device can capture image meta-data * \return True if the device can capture image meta-data
*/ */
/**
* \fn V4L2Capability::isMetaOutput()
* \brief Identify if the device outputs image meta-data
* \return True if the device can output image meta-data
*/
/** /**
* \fn V4L2Capability::hasStreaming() * \fn V4L2Capability::hasStreaming()
* \brief Determine if the device can perform Streaming I/O * \brief Determine if the device can perform Streaming I/O
@ -348,6 +354,9 @@ int V4L2Device::open()
} else if (caps_.isMetaCapture()) { } else if (caps_.isMetaCapture()) {
fdEvent_ = new EventNotifier(fd_, EventNotifier::Read); fdEvent_ = new EventNotifier(fd_, EventNotifier::Read);
bufferType_ = V4L2_BUF_TYPE_META_CAPTURE; bufferType_ = V4L2_BUF_TYPE_META_CAPTURE;
} else if (caps_.isMetaOutput()) {
fdEvent_ = new EventNotifier(fd_, EventNotifier::Write);
bufferType_ = V4L2_BUF_TYPE_META_OUTPUT;
} else { } else {
LOG(V4L2, Error) << "Device is not a supported type"; LOG(V4L2, Error) << "Device is not a supported type";
return -EINVAL; return -EINVAL;