libcamera: controls: Don't over-optimize ControlValue layout
The ControlValue class size should be minimized to save space, as it can
be instantiated in large numbers. The current implementation does so by
specifying several members as bitfields, but does so too aggressively,
resulting in fields being packed in an inefficient to access way on some
platforms. For instance, on 32-bit x86, the numElements_ field is offset
by 7 bits in a 32-bit word. This additionally causes a static assert
that checks the size of the class to fail.
Relax the constraints on the isArray_ and numElements_ fields to avoid
inefficient access, and to ensure that the class size is identical
across all platforms. This will need to be revisited anyway when
stabilizing the ABI, so add a \todo comment as a reminder.
Fixes: 1fa4b43402
("libcamera: controls: Support array controls in ControlValue")
Reported-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
916df9e38d
commit
0028536d70
3 changed files with 5 additions and 3 deletions
|
@ -176,8 +176,8 @@ public:
|
|||
|
||||
private:
|
||||
ControlType type_ : 8;
|
||||
bool isArray_ : 1;
|
||||
std::size_t numElements_ : 16;
|
||||
bool isArray_;
|
||||
std::size_t numElements_ : 32;
|
||||
union {
|
||||
uint64_t value_;
|
||||
void *storage_;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue