f1569db3fb
On DelayedControls::reset(), the values retrieved from the sensor device
were added to the queues with the updated flag set to true. This would
cause the helper to write out the value to the device again on the first
DelayedControls::applyControls() call. This is unnecessary, as the
controls written are identical to what is stored in the device driver.
Fix this by explicitly setting the update flag to false in
DelayedControls::reset() when adding the controls to the queue.
Additionally, use the Info() constructor when adding items to the queue
for consistency.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Fixes: 3d4b7b0059 ("libcamera: delayed_controls: Add helper for controls that apply with a delay")
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Tested-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
87 lines
1.9 KiB
C++
87 lines
1.9 KiB
C++
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
/*
|
|
* Copyright (C) 2020, Raspberry Pi (Trading) Ltd.
|
|
*
|
|
* delayed_controls.h - Helper to deal with controls that take effect with a delay
|
|
*/
|
|
#ifndef __LIBCAMERA_INTERNAL_DELAYED_CONTROLS_H__
|
|
#define __LIBCAMERA_INTERNAL_DELAYED_CONTROLS_H__
|
|
|
|
#include <stdint.h>
|
|
#include <unordered_map>
|
|
|
|
#include <libcamera/controls.h>
|
|
|
|
namespace libcamera {
|
|
|
|
class V4L2Device;
|
|
|
|
class DelayedControls
|
|
{
|
|
public:
|
|
struct ControlParams {
|
|
unsigned int delay;
|
|
bool priorityWrite;
|
|
};
|
|
|
|
DelayedControls(V4L2Device *device,
|
|
const std::unordered_map<uint32_t, ControlParams> &controlParams);
|
|
|
|
void reset();
|
|
|
|
bool push(const ControlList &controls);
|
|
ControlList get(uint32_t sequence);
|
|
|
|
void applyControls(uint32_t sequence);
|
|
|
|
private:
|
|
class Info : public ControlValue
|
|
{
|
|
public:
|
|
Info()
|
|
: updated(false)
|
|
{
|
|
}
|
|
|
|
Info(const ControlValue &v, bool updated_ = true)
|
|
: ControlValue(v), updated(updated_)
|
|
{
|
|
}
|
|
|
|
bool updated;
|
|
};
|
|
|
|
/* \todo: Make the listSize configurable at instance creation time. */
|
|
static constexpr int listSize = 16;
|
|
class ControlRingBuffer : public std::array<Info, listSize>
|
|
{
|
|
public:
|
|
Info &operator[](unsigned int index)
|
|
{
|
|
return std::array<Info, listSize>::operator[](index % listSize);
|
|
}
|
|
|
|
const Info &operator[](unsigned int index) const
|
|
{
|
|
return std::array<Info, listSize>::operator[](index % listSize);
|
|
}
|
|
};
|
|
|
|
V4L2Device *device_;
|
|
/* \todo Evaluate if we should index on ControlId * or unsigned int */
|
|
std::unordered_map<const ControlId *, ControlParams> controlParams_;
|
|
unsigned int maxDelay_;
|
|
|
|
bool running_;
|
|
uint32_t firstSequence_;
|
|
|
|
uint32_t queueCount_;
|
|
uint32_t writeCount_;
|
|
/* \todo Evaluate if we should index on ControlId * or unsigned int */
|
|
std::unordered_map<const ControlId *, ControlRingBuffer> values_;
|
|
};
|
|
|
|
} /* namespace libcamera */
|
|
|
|
#endif /* __LIBCAMERA_INTERNAL_DELAYED_CONTROLS_H__ */
|