mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-12 23:09:45 +03:00
afd9890b7b
A second use-after-free bug related to signals staying connected after the receiver DelayedControls instance gets deleted has been found, this time in the simple pipeline handler. Fix the issue once and for all by making the DelayedControls class inherit from Object. This will disconnect signals automatically upon deletion of the receiver. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> Tested-by: Isaac Scott <isaac.scott@ideasonboard.com> Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
83 lines
1.7 KiB
C++
83 lines
1.7 KiB
C++
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
/*
|
|
* Copyright (C) 2020, Raspberry Pi Ltd
|
|
*
|
|
* Helper to deal with controls that take effect with a delay
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <stdint.h>
|
|
#include <unordered_map>
|
|
|
|
#include <libcamera/base/object.h>
|
|
|
|
#include <libcamera/controls.h>
|
|
|
|
namespace libcamera {
|
|
|
|
class V4L2Device;
|
|
|
|
class DelayedControls : public Object
|
|
{
|
|
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_;
|
|
|
|
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 */
|