summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-05-25 00:32:00 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-06-19 02:44:04 +0200
commit3e51cc30bf9d71e06b0fdc252c5aed70047429cb (patch)
treeb7abd1fb84f00d7177dbb875d527cdfc11d70189 /src
parent1cf709b1d2bbaf95e8a4bd3eb8962340e372a76a (diff)
libcamera: v4l2_subdevice: Breakout mbus code enumeration
Simplify frame size enumeration by breaking out mbus code enumeration in a helper, making the code easier to read while also preparing for enhancing the frame size enumeration. 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>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/include/v4l2_subdevice.h1
-rw-r--r--src/libcamera/v4l2_subdevice.cpp59
2 files changed, 34 insertions, 26 deletions
diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h
index 3e4e5107..e714e257 100644
--- a/src/libcamera/include/v4l2_subdevice.h
+++ b/src/libcamera/include/v4l2_subdevice.h
@@ -57,6 +57,7 @@ protected:
std::string logPrefix() const;
private:
+ std::vector<unsigned int> enumPadCodes(unsigned int pad);
int enumPadSizes(unsigned int pad, unsigned int code,
std::vector<SizeRange> *size);
diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp
index fceee331..99e202fa 100644
--- a/src/libcamera/v4l2_subdevice.cpp
+++ b/src/libcamera/v4l2_subdevice.cpp
@@ -203,37 +203,15 @@ int V4L2Subdevice::setCompose(unsigned int pad, Rectangle *rect)
FormatEnum V4L2Subdevice::formats(unsigned int pad)
{
FormatEnum formatMap = {};
- struct v4l2_subdev_mbus_code_enum mbusEnum = {};
- int ret;
if (pad >= entity_->pads().size()) {
LOG(V4L2Subdev, Error) << "Invalid pad: " << pad;
- return formatMap;
+ return {};
}
- mbusEnum.pad = pad;
- mbusEnum.index = 0;
- mbusEnum.which = V4L2_SUBDEV_FORMAT_ACTIVE;
- while (true) {
- ret = ioctl(fd_, VIDIOC_SUBDEV_ENUM_MBUS_CODE, &mbusEnum);
- if (ret)
- break;
-
- ret = enumPadSizes(pad, mbusEnum.code,
- &formatMap[mbusEnum.code]);
- if (ret)
- break;
-
- mbusEnum.index++;
- }
-
- if (ret && (errno != EINVAL && errno != ENOTTY)) {
- ret = -errno;
- LOG(V4L2Subdev, Error)
- << "Unable to enumerate formats on pad " << pad
- << ": " << strerror(-ret);
- formatMap.clear();
- }
+ for (unsigned int code : enumPadCodes(pad))
+ if (enumPadSizes(pad, code, &formatMap[code]))
+ return {};
return formatMap;
}
@@ -328,6 +306,35 @@ std::string V4L2Subdevice::logPrefix() const
return "'" + entity_->name() + "'";
}
+std::vector<unsigned int> V4L2Subdevice::enumPadCodes(unsigned int pad)
+{
+ std::vector<unsigned int> codes;
+ int ret;
+
+ for (unsigned int index = 0; ; index++) {
+ struct v4l2_subdev_mbus_code_enum mbusEnum = {};
+ mbusEnum.pad = pad;
+ mbusEnum.index = index;
+ mbusEnum.which = V4L2_SUBDEV_FORMAT_ACTIVE;
+
+ ret = ioctl(fd_, VIDIOC_SUBDEV_ENUM_MBUS_CODE, &mbusEnum);
+ if (ret)
+ break;
+
+ codes.push_back(mbusEnum.code);
+ }
+
+ if (ret && errno != EINVAL) {
+ ret = errno;
+ LOG(V4L2Subdev, Error)
+ << "Unable to enumerate formats on pad " << pad
+ << ": " << strerror(ret);
+ return {};
+ }
+
+ return codes;
+}
+
int V4L2Subdevice::enumPadSizes(unsigned int pad,unsigned int code,
std::vector<SizeRange> *sizes)
{