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

libcamera: v4l2_videodevice: Cache PixelFormatInfo

Browse source 
Cache the PixelFormatInfo instead of looking it up in every call to
createBuffer(). This prepares for usage of the info in queueBuffer(), to
avoid a looking every time a buffer is queued.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Laurent Pinchart 2021-09-01 21:00:24 +03:00
parent 81a38f4373
commit 6d98fe5b68
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/libcamera/internal/v4l2_videodevice.h
View file

@ -241,6 +241,7 @@ private:
V4L2Capability caps_; V4L2Capability caps_;
V4L2DeviceFormat format_; V4L2DeviceFormat format_;
const PixelFormatInfo *formatInfo_;
enum v4l2_buf_type bufferType_; enum v4l2_buf_type bufferType_;
enum v4l2_memory memoryType_; enum v4l2_memory memoryType_;

28
src/libcamera/v4l2_videodevice.cpp
View file

@ -482,8 +482,8 @@ const std::string V4L2DeviceFormat::toString() const
* \param[in] deviceNode The file-system path to the video device node * \param[in] deviceNode The file-system path to the video device node
*/ */
V4L2VideoDevice::V4L2VideoDevice(const std::string &deviceNode) V4L2VideoDevice::V4L2VideoDevice(const std::string &deviceNode)
: V4L2Device(deviceNode), cache_(nullptr), fdBufferNotifier_(nullptr), : V4L2Device(deviceNode), formatInfo_(nullptr), cache_(nullptr),
streaming_(false) fdBufferNotifier_(nullptr), streaming_(false)
{ {
/* /*
* We default to an MMAP based CAPTURE video device, however this will * We default to an MMAP based CAPTURE video device, however this will
@ -586,6 +586,8 @@ int V4L2VideoDevice::open()
return ret; return ret;
} }
formatInfo_ = &PixelFormatInfo::info(format_.fourcc);
return 0; return 0;
} }
@ -681,6 +683,8 @@ int V4L2VideoDevice::open(int handle, enum v4l2_buf_type type)
return ret; return ret;
} }
formatInfo_ = &PixelFormatInfo::info(format_.fourcc);
return 0; return 0;
} }
@ -695,6 +699,8 @@ void V4L2VideoDevice::close()
releaseBuffers(); releaseBuffers();
delete fdBufferNotifier_; delete fdBufferNotifier_;
formatInfo_ = nullptr;
V4L2Device::close(); V4L2Device::close();
} }
@ -787,6 +793,8 @@ int V4L2VideoDevice::setFormat(V4L2DeviceFormat *format)
return ret; return ret;
format_ = *format; format_ = *format;
formatInfo_ = &PixelFormatInfo::info(format_.fourcc);
return 0; return 0;
} }
@ -1325,19 +1333,23 @@ std::unique_ptr<FrameBuffer> V4L2VideoDevice::createBuffer(unsigned int index)
planes.push_back(std::move(plane)); planes.push_back(std::move(plane));
} }
const auto &info = PixelFormatInfo::info(format_.fourcc); /*
if (info.isValid() && info.numPlanes() != numPlanes) { * The format info is not guaranteed to be valid, as there are no
* PixelFormatInfo for metadata formats, so check it first.
*/
if (formatInfo_->isValid() && formatInfo_->numPlanes() != numPlanes) {
ASSERT(numPlanes == 1u); ASSERT(numPlanes == 1u);
const size_t numColorPlanes = info.numPlanes();
planes.resize(numColorPlanes); planes.resize(formatInfo_->numPlanes());
const FileDescriptor &fd = planes[0].fd; const FileDescriptor &fd = planes[0].fd;
size_t offset = 0; size_t offset = 0;
for (size_t i = 0; i < numColorPlanes; ++i) {
for (size_t i = 0; i < planes.size(); ++i) {
planes[i].fd = fd; planes[i].fd = fd;
planes[i].offset = offset; planes[i].offset = offset;
/* \todo Take the V4L2 stride into account */ /* \todo Take the V4L2 stride into account */
planes[i].length = info.planeSize(format_.size, i); planes[i].length = formatInfo_->planeSize(format_.size, i);
offset += planes[i].length; offset += planes[i].length;
} }
} }