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

libcamera: v4l2_subdevice: Rework enumPadSizes()

Browse Source 
Align the enumPadSizes() interface and implementation with that of
enumPadCodes(). There is no functional change.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2019-05-25 00:54:17 +02:00
parent 3e51cc30bf
commit be78ffbe9a
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcamera/include/v4l2_subdevice.h
View File

@@ -58,8 +58,8 @@ protected:
private:
std::vector<unsigned int> enumPadCodes(unsigned int pad);
int enumPadSizes(unsigned int pad, unsigned int code,
std::vector<SizeRange> *size);
std::vector<SizeRange> enumPadSizes(unsigned int pad,
unsigned int code);
int setSelection(unsigned int pad, unsigned int target,
Rectangle *rect);

38
src/libcamera/v4l2_subdevice.cpp
View File

@@ -209,10 +209,14 @@ FormatEnum V4L2Subdevice::formats(unsigned int pad)
return {};
}
for (unsigned int code : enumPadCodes(pad))
if (enumPadSizes(pad, code, &formatMap[code]))
for (unsigned int code : enumPadCodes(pad)) {
std::vector<SizeRange> sizes = enumPadSizes(pad, code);
if (sizes.empty())
return {};
formatMap[code] = sizes;
}
return formatMap;
}
@@ -335,25 +339,25 @@ std::vector<unsigned int> V4L2Subdevice::enumPadCodes(unsigned int pad)
return codes;
}
int V4L2Subdevice::enumPadSizes(unsigned int pad,unsigned int code,
std::vector<SizeRange> *sizes)
std::vector<SizeRange> V4L2Subdevice::enumPadSizes(unsigned int pad,
unsigned int code)
{
struct v4l2_subdev_frame_size_enum sizeEnum = {};
std::vector<SizeRange> sizes;
int ret;
sizeEnum.index = 0;
sizeEnum.pad = pad;
sizeEnum.code = code;
sizeEnum.which = V4L2_SUBDEV_FORMAT_ACTIVE;
while (true) {
for (unsigned int index = 0;; index++) {
struct v4l2_subdev_frame_size_enum sizeEnum = {};
sizeEnum.index = index;
sizeEnum.pad = pad;
sizeEnum.code = code;
sizeEnum.which = V4L2_SUBDEV_FORMAT_ACTIVE;
ret = ioctl(fd_, VIDIOC_SUBDEV_ENUM_FRAME_SIZE, &sizeEnum);
if (ret)
break;
sizes->emplace_back(sizeEnum.min_width, sizeEnum.min_height,
sizeEnum.max_width, sizeEnum.max_height);
sizeEnum.index++;
sizes.emplace_back(sizeEnum.min_width, sizeEnum.min_height,
sizeEnum.max_width, sizeEnum.max_height);
}
if (ret && (errno != EINVAL && errno != ENOTTY)) {
@@ -361,12 +365,10 @@ int V4L2Subdevice::enumPadSizes(unsigned int pad,unsigned int code,
LOG(V4L2Subdev, Error)
<< "Unable to enumerate sizes on pad " << pad
<< ": " << strerror(-ret);
sizes->clear();
return ret;
return {};
}
return 0;
return sizes;
}
int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target,