@@ -16,29 +16,18 @@
#include <linux/v4l2-controls.h>
#include <linux/videodev2.h>
+#include <libcamera/data_value.h>
+
namespace libcamera {
-class V4L2ControlInfo
+class V4L2ControlInfo : public DataInfo
{
public:
V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl);
-
unsigned int id() const { return id_; }
- unsigned int type() const { return type_; }
- size_t size() const { return size_; }
- const std::string &name() const { return name_; }
-
- int64_t min() const { return min_; }
- int64_t max() const { return max_; }
private:
unsigned int id_;
- unsigned int type_;
- size_t size_;
- std::string name_;
-
- int64_t min_;
- int64_t max_;
};
using V4L2ControlInfoMap = std::map<unsigned int, V4L2ControlInfo>;
@@ -49,14 +38,15 @@ public:
V4L2Control(unsigned int id, int value = 0)
: id_(id), value_(value) {}
- int64_t value() const { return value_; }
+ DataType type() const { return value_.type(); }
+ int64_t value() const { return value_.getInt64(); }
void setValue(int64_t value) { value_ = value; }
unsigned int id() const { return id_; }
private:
unsigned int id_;
- int64_t value_;
+ DataValue value_;
};
class V4L2ControlList
@@ -44,7 +44,6 @@ protected:
private:
void listControls();
void updateControls(V4L2ControlList *ctrls,
- const V4L2ControlInfo **controlInfo,
const struct v4l2_ext_control *v4l2Ctrls,
unsigned int count);
@@ -69,13 +69,10 @@ namespace libcamera {
* \param ctrl The struct v4l2_query_ext_ctrl as returned by the kernel
*/
V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
+ : DataInfo(DataValue(static_cast<int64_t>(ctrl.minimum)),
+ DataValue(static_cast<int64_t>(ctrl.maximum))),
+ id_(ctrl.id)
{
- id_ = ctrl.id;
- type_ = ctrl.type;
- name_ = static_cast<const char *>(ctrl.name);
- size_ = ctrl.elem_size * ctrl.elems;
- min_ = ctrl.minimum;
- max_ = ctrl.maximum;
}
/**
@@ -84,36 +81,6 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
* \return The V4L2 control ID
*/
-/**
- * \fn V4L2ControlInfo::type()
- * \brief Retrieve the control type as defined by V4L2_CTRL_TYPE_*
- * \return The V4L2 control type
- */
-
-/**
- * \fn V4L2ControlInfo::size()
- * \brief Retrieve the control value data size (in bytes)
- * \return The V4L2 control value data size
- */
-
-/**
- * \fn V4L2ControlInfo::name()
- * \brief Retrieve the control user readable name
- * \return The V4L2 control user readable name
- */
-
-/**
- * \fn V4L2ControlInfo::min()
- * \brief Retrieve the control minimum value
- * \return The V4L2 control minimum value
- */
-
-/**
- * \fn V4L2ControlInfo::max()
- * \brief Retrieve the control maximum value
- * \return The V4L2 control maximum value
- */
-
/**
* \typedef V4L2ControlInfoMap
* \brief A map of control ID to V4L2ControlInfo
@@ -134,6 +101,10 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
* to be directly used but are instead intended to be grouped in
* V4L2ControlList instances, which are then passed as parameters to
* V4L2Device::setControls() and V4L2Device::getControls() operations.
+ *
+ * \todo Currently all V4L2Controls are integers. For the sake of keeping the
+ * implementation as simpler as possible treat all values as int64. The value()
+ * and setValue() operations use that single data type for now.
*/
/**
@@ -143,6 +114,12 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)
* \param value The control value
*/
+/**
+ * \fn V4L2Control::type()
+ * \brief Retrieve the type of the control
+ * \return The control type
+ */
+
/**
* \fn V4L2Control::value()
* \brief Retrieve the value of the control
@@ -210,7 +210,7 @@ int V4L2Device::getControls(V4L2ControlList *ctrls)
ret = errorIdx;
}
- updateControls(ctrls, controlInfo, v4l2Ctrls, count);
+ updateControls(ctrls, v4l2Ctrls, count);
return ret;
}
@@ -262,8 +262,8 @@ int V4L2Device::setControls(V4L2ControlList *ctrls)
v4l2Ctrls[i].id = info->id();
/* Set the v4l2_ext_control value for the write operation. */
- switch (info->type()) {
- case V4L2_CTRL_TYPE_INTEGER64:
+ switch (ctrl->type()) {
+ case DataTypeInteger64:
v4l2Ctrls[i].value64 = ctrl->value();
break;
default:
@@ -299,7 +299,7 @@ int V4L2Device::setControls(V4L2ControlList *ctrls)
ret = errorIdx;
}
- updateControls(ctrls, controlInfo, v4l2Ctrls, count);
+ updateControls(ctrls, v4l2Ctrls, count);
return ret;
}
@@ -352,8 +352,7 @@ void V4L2Device::listControls()
ctrl.flags & V4L2_CTRL_FLAG_DISABLED)
continue;
- V4L2ControlInfo info(ctrl);
- switch (info.type()) {
+ switch (ctrl.type) {
case V4L2_CTRL_TYPE_INTEGER:
case V4L2_CTRL_TYPE_BOOLEAN:
case V4L2_CTRL_TYPE_MENU:
@@ -364,11 +363,12 @@ void V4L2Device::listControls()
break;
/* \todo Support compound controls. */
default:
- LOG(V4L2, Debug) << "Control type '" << info.type()
+ LOG(V4L2, Debug) << "Control type '" << ctrl.type
<< "' not supported";
continue;
}
+ V4L2ControlInfo info(ctrl);
controls_.emplace(ctrl.id, info);
}
}
@@ -382,25 +382,22 @@ void V4L2Device::listControls()
* \param[in] count The number of controls to update
*/
void V4L2Device::updateControls(V4L2ControlList *ctrls,
- const V4L2ControlInfo **controlInfo,
const struct v4l2_ext_control *v4l2Ctrls,
unsigned int count)
{
for (unsigned int i = 0; i < count; ++i) {
- const struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i];
- const V4L2ControlInfo *info = controlInfo[i];
V4L2Control *ctrl = ctrls->getByIndex(i);
- switch (info->type()) {
- case V4L2_CTRL_TYPE_INTEGER64:
- ctrl->setValue(v4l2Ctrl->value64);
+ switch (ctrl->type()) {
+ case DataTypeInteger64:
+ ctrl->setValue(v4l2Ctrls[i].value64);
break;
default:
/*
* \todo To be changed when support for string and
* compound controls will be added.
*/
- ctrl->setValue(v4l2Ctrl->value);
+ ctrl->setValue(v4l2Ctrls[i].value);
break;
}
}
Use DataValue and DataInfo in the V4L2 control handling classes to maximize code reuse with the libcamera controls classes. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- src/libcamera/include/v4l2_controls.h | 22 ++++-------- src/libcamera/include/v4l2_device.h | 1 - src/libcamera/v4l2_controls.cpp | 49 +++++++-------------------- src/libcamera/v4l2_device.cpp | 25 ++++++-------- 4 files changed, 30 insertions(+), 67 deletions(-)