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

Revert "libcamera: V4L2Device: Remove the controls order assumption in updateControls()"

Browse source 
This reverts commit 34bee5e84e.

The commit introduced a breakage in the master branch, reported by
linux-surface users already. Let's revert it while discussing the
propert fix.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>
Acked-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Tested-by: Umang Jain <umang.jain@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-05-25 11:54:07 +03:00
parent a25a611bb3
commit 67a83e126b
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libcamera/v4l2_device.cpp
View file

@ -244,6 +244,12 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)
ControlList ctrls{ controls_ }; ControlList ctrls{ controls_ };
/*
* Start by filling the ControlList. This can't be combined with filling
* v4l2Ctrls, as updateControls() relies on both containers having the
* same order, and the control list is based on a map, which is not
* sorted by insertion order.
*/
for (uint32_t id : ids) { for (uint32_t id : ids) {
const auto iter = controls_.find(id); const auto iter = controls_.find(id);
if (iter == controls_.end()) { if (iter == controls_.end()) {
@ -617,13 +623,19 @@ void V4L2Device::updateControlInfo()
void V4L2Device::updateControls(ControlList *ctrls, void V4L2Device::updateControls(ControlList *ctrls,
Span<const v4l2_ext_control> v4l2Ctrls) Span<const v4l2_ext_control> v4l2Ctrls)
{ {
for (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) { unsigned int i = 0;
const unsigned int id = v4l2Ctrl.id; for (auto &ctrl : *ctrls) {
if (i == v4l2Ctrls.size())
break;
ControlValue value = ctrls->get(id); const struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i];
switch (value.type()) { unsigned int id = ctrl.first;
ControlValue &value = ctrl.second;
const auto iter = controls_.find(id);
switch (iter->first->type()) {
case ControlTypeInteger64: case ControlTypeInteger64:
value.set<int64_t>(v4l2Ctrl.value64); value.set<int64_t>(v4l2Ctrl->value64);
break; break;
case ControlTypeByte: case ControlTypeByte:
@ -638,11 +650,11 @@ void V4L2Device::updateControls(ControlList *ctrls,
* \todo To be changed when support for string controls * \todo To be changed when support for string controls
* will be added. * will be added.
*/ */
value.set<int32_t>(v4l2Ctrl.value); value.set<int32_t>(v4l2Ctrl->value);
break; break;
} }
ctrls->set(id, value); i++;
} }
} }