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

libcamera: v4l2_device: Rename plane format fields

Browse source 
Rename the number of valid plane formats to 'planesCount' and the actual
per-plane size information array to 'planes'.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2019-02-01 09:58:59 +01:00
parent 755644fe64
commit a9f302dc05
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,8 +63,8 @@ public:
struct { struct {
uint32_t size; uint32_t size;
uint32_t bpl; uint32_t bpl;
} planesFmt[3]; } planes[3];
unsigned int planes; unsigned int planesCount;
}; };
class MediaEntity; class MediaEntity;

29
src/libcamera/v4l2_device.cpp
View file

@ -92,7 +92,7 @@ LOG_DEFINE_CATEGORY(V4L2)
* *
* Formats defined as 'single planar' by the V4L2 APIs are represented with * Formats defined as 'single planar' by the V4L2 APIs are represented with
* V4L2DeviceFormat instances with a single plane * V4L2DeviceFormat instances with a single plane
* (V4L2DeviceFormat::planes = 1). Semi-planar and multiplanar formats use * (V4L2DeviceFormat::planesCount = 1). Semi-planar and multiplanar formats use
* 2 and 3 planes respectively. * 2 and 3 planes respectively.
* *
* V4L2DeviceFormat defines the exchange format between components that * V4L2DeviceFormat defines the exchange format between components that
@ -120,19 +120,18 @@ LOG_DEFINE_CATEGORY(V4L2)
*/ */
/** /**
* \var V4L2DeviceFormat::planesFmt * \var V4L2DeviceFormat::planes
* \brief The per-plane size information * \brief The per-plane size information
* *
* Images are stored in memory in one or more data planes. Each data plane * Images are stored in memory in one or more data planes. Each data plane
* has a specific size and line length, which could differ from the image * has a specific size and line length, which could differ from the image
* visible sizes to accommodate line or plane padding data. * visible sizes to accommodate line or plane padding data.
* *
* Only the first V4L2DeviceFormat::planes entries are considered valid. * Only the first \ref planesCount entries are considered valid.
*
*/ */
/** /**
* \var V4L2DeviceFormat::planes * \var V4L2DeviceFormat::planesCount
* \brief The number of valid data planes * \brief The number of valid data planes
*/ */
@ -315,9 +314,9 @@ int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format)
format->width = pix->width; format->width = pix->width;
format->height = pix->height; format->height = pix->height;
format->fourcc = pix->pixelformat; format->fourcc = pix->pixelformat;
format->planes = 1; format->planesCount = 1;
format->planesFmt[0].bpl = pix->bytesperline; format->planes[0].bpl = pix->bytesperline;
format->planesFmt[0].size = pix->sizeimage; format->planes[0].size = pix->sizeimage;
return 0; return 0;
} }
@ -360,11 +359,11 @@ int V4L2Device::getFormatMultiplane(V4L2DeviceFormat *format)
format->width = pix->width; format->width = pix->width;
format->height = pix->height; format->height = pix->height;
format->fourcc = pix->pixelformat; format->fourcc = pix->pixelformat;
format->planes = pix->num_planes; format->planesCount = pix->num_planes;
for (unsigned int i = 0; i < format->planes; ++i) { for (unsigned int i = 0; i < format->planesCount; ++i) {
format->planesFmt[i].bpl = pix->plane_fmt[i].bytesperline; format->planes[i].bpl = pix->plane_fmt[i].bytesperline;
format->planesFmt[i].size = pix->plane_fmt[i].sizeimage; format->planes[i].size = pix->plane_fmt[i].sizeimage;
} }
return 0; return 0;
@ -380,11 +379,11 @@ int V4L2Device::setFormatMultiplane(V4L2DeviceFormat *format)
pix->width = format->width; pix->width = format->width;
pix->height = format->height; pix->height = format->height;
pix->pixelformat = format->fourcc; pix->pixelformat = format->fourcc;
pix->num_planes = format->planes; pix->num_planes = format->planesCount;
for (unsigned int i = 0; i < pix->num_planes; ++i) { for (unsigned int i = 0; i < pix->num_planes; ++i) {
pix->plane_fmt[i].bytesperline = format->planesFmt[i].bpl; pix->plane_fmt[i].bytesperline = format->planes[i].bpl;
pix->plane_fmt[i].sizeimage = format->planesFmt[i].size; pix->plane_fmt[i].sizeimage = format->planes[i].size;
} }
ret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format); ret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format);