| Age | Commit message (Collapse) | Author |
|---|
|
The abi-compliance-checker reports there are both ABI and API changes in this
release:
Binary compatibility: 99%
Source compatibility: 99.5%
Total binary compatibility problems: 5, warnings: 1
Total source compatibility problems: 6, warnings: 1
Substantially less than the previous release, and ultimately quite minor but
unfortunately there nonetheless and so the SONAME is updated to 0.5
accordingly. I do not anticipate anything there that cannot be solved for
applications without just a recompile. I had hoped to get a longer run for 0.4
series...
A full and detailed ABI report for those interested can always be generated
between any two versions with the internal tooling:
"./utils/abi-compat.sh v0.4.0 v0.5.0"
Integration overview:
This release brings in 201 commits with a huge list of fixes and code clean up
which I'm very happy to see, including interesting fixes to the AGC and AWB
handling in libipa.
In regards to new features, libcamera-0.5 has aptly now got the core Raspberry
Pi 5 support merged!. There are still patches that are currently maintained by
Raspberry Pi for additional features, and while the transition to upstream
API's continue, but I think we're all happy to see this support getting in
directly, and Raspberry Pi continue to lead the way in upstream camera
development. I look forward to the kernel API's for streams being fully
utilised by the PiSP platform for upstream camera metadata handling. This
upcoming work is also supported by the CameraSensor factory and CameraSensorRaw
support that is now also merged in this release.
Further more in the platform support, the software_isp continues to be
developed and is now able to measure colour temperature, which will bring in
improvements for AWB, and a CCM can be applied while peforming debayering (at a
CPU cost) which will allow us to finally apply color tuning for sensors on
devices that need to fall back to the software ISP.
New sensor support seems fairly short in this release, with the IMX415 being
the prominent addition.
In libipa, and algorithm developments, along with many fixes and improvements
there is a substantial new feature that the Baysian AWB algorithm from
Raspberry Pi can now also be used on all libipa supported IPA modules, and has
shown good impovements for the RkISP1 supported devices.
There is minimal changes to the application support side, but it is notable
that now the Y444 format has been mapped to be usable by the gstreamer src
element. lc-compliance has seen some progress which I hope will bring this to
being a more central part of the test infrastructure.
The following commits in this release relate to either a bug fix or an
improvement to an existing commit.
- DmaBufAllocator: Make DmaSyncer non-copyable
- Fixes: 39482d59fe71 ("DmaBufAllocator: Add Dma Buffer synchronization function & helper class")
- utils: codegen: controls.py: Fix missing direction error message
- Fixes: 39fe4ad96803 ("utils: codegen: controls.py: Parse direction information")
- Thread: Fix setThreadAffinity race condition in start
- Fixes: 4d9db06d6690 ("libcamera: add method to set thread affinity")
- meson: Don't override pipeline list when `auto` is selected
- Bug: https://bugs.libcamera.org/show_bug.cgi?id=247
- DmaBufAllocator: Avoid syncing with an invalid file descriptor
- Fixes: 545046a41e17 ("DmaBufAllocator: Make DmaSyncer non-copyable")
- controls: Introduce AEGC-related controls
- Bug: https://bugs.libcamera.org/show_bug.cgi?id=42
- Documentation: guides: application-developer: Fix variable shadowing
- Bug: https://bugs.libcamera.org/show_bug.cgi?id=252
- libcamera: pipeline: virtual: Fill buffer's metadata
- Bug: https://bugs.libcamera.org/show_bug.cgi?id=245
- ipa: rkisp1: agc: Fix build on debian 11 (gcc-9)
- Fixes: ee918b370a08 ("ipa: rkisp1: agc: Initialize enum controls with a list of values")
- ipa: rpi: Apply default ControlInfo values for sensor controls
- Bug: https://bugs.libcamera.org/show_bug.cgi?id=253
- ipa: rpi: Fix incorrect cast for ExposureTime ControlInfo
- Fixes: bea2db5e6190 ("ipa: rpi: Apply default ControlInfo values for sensor controls")
- ipa: rkisp1: algorithms: agc: Fix whitespace
- Fixes: 0e0e32b1890c ("ipa: rkisp1: algorithms: agc: Check for correct stats type")
- libcamera: pipeline: Fix LIBCAMERA_<NAME>_TUNING_FILE handling
- Fixes: f5da05ed03ee ("libcamera: pipeline: Move tuning file override handling to IPAProxy")
- ipa: rkisp1: algorithms: awb: Fix AWB means vector order in RGB mode
- Fixes: 29892f1c56c6 ("ipa: libipa: colour: Use the RGB class to model RGB values")
- libipa: awb: Fix non-virtual destructor warning in AwbStats
- Fixes: 6f663990a0f7 ("libipa: Add AWB algorithm base class")
- ipa: rkisp1: Allow exposure time to be shorter than minimum frame duration limit
- Fixes: f72c76eb6e06 ("rkisp1: Honor the FrameDurationLimits control")
- ipa: libipa: Fix bug in ExposureModeHelper that leads to oscillations in AEGC
- Fixes: 34c9ab62827b ("ipa: libipa: Add ExposureModeHelper")
- libcamera: software_isp: Emit ispStatsReady only if IPA is running
- Reported-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
- libcamera: base: log: Fix uninitialized variable warning
- Fixes: 8fa119e0b50f ("libcamera: base: log: Use `std::from_chars()`")
- libcamera: media_object: Fix unnecessary copy
- Fixes: 9490c664b57a6c ("libcamera: Add members to MediaEntity to support ancillary entities")
- ipa: rkisp1: agc: Fix metering modes
- Fixes: 4c5152843a2a ("ipa: rkisp1: Derive rkisp1::algorithms::Agc from AgcMeanLuminance")
- libcamera: software_isp: Reset stored exposure in black level
- Bug: https://bugs.libcamera.org/show_bug.cgi?id=259
- libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode` control setup
- Fixes: bad8d591f8acfa ("libcamera: uvcvideo: Register ExposureTimeMode control")
- libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode` control setting
- Fixes: bad8d591f8acfa ("libcamera: uvcvideo: Register ExposureTimeMode control")
- ipa: simple: Initialize ccmEnabled to false
- Fixes: ac3068655643 ("libcamera: software_isp: Track whether CCM is enabled")
- gstreamer: Use `Control<>` objects when setting controls
- Bug: https://bugs.libcamera.org/show_bug.cgi?id=261
- gstreamer: Restore `AeEnable` control
- Fixes: 187f2d537be5a4 ("gstreamer: Generate the new AEGC controls")
- pipeline: rpi: Fix potential empty optional read
- Fixes: 6c71ee1f153051 ("pipeline: raspberrypi: Introduce PipelineHandlerBase class")
And the following updates have been made in this release, grouped by category:
core:
- libcamera: virtual: Avoid some copies
- libcamera: virtual: Query number of planes correctly
- libcamera: virtual: Speed up test pattern animation
- libcamera: camera_sensor_properties: Add delays for imx415
- include: linux: Update headers for line-based embedded data support
- include: linux: videodev2: Add generic line based pixel formats
- libcamera: v4l2_subdevice: Add new metadata formats
- libcamera: v4l2_videodevice: Update to the new kernel metadata API
- libcamera: Add CameraSensor implementation for raw V4L2 sensors
- libcamera: camera_sensor: Add support for embedded data
- libcamera: base: Remove custom __nodiscard attribute
- libcamera: Add missing <stdint.h> include to dma_buf_allocator.h
- libcamera: include: Include missing stdint.h header
- utils: codegen: controls.py: Fix missing direction error message
- meson: Convert `v4l2` into a feature option
- meson: Don't override pipeline list when `auto` is selected
- libcamera: pipeline_handler: Enable silent configuration file lookup
- libcamera: virtual: Install configuration file
- libcamera: v4l2_subdevice: Work around false positive warning
- libcamera: uvcvideo: Register ExposureTimeMode control
- libcamera: camera: Pre-process AeEnable control
- libcamera: base: object,thread: Disable copy/move
- libcamera: matrix: Add read-only accessor to internal data
- libcamera: log: Match whole category in LIBCAMERA_LOG_LEVELS
- libcamera: Copy Vector class files from libipa
- libcamera: Adapt Vector class to new location
- libcamera: request: addBuffer(): Do fence check earlier
- libcamera: Drop spurious colon after doxygen \todo directive
- meson: Enable the -Wnon-virtual-dtor compiler option
- libcamera: formatting: Avoid spaces in for loops without expression
- libcamera: base: log: Remove move constructor
- libcamera: base: log: Use `std::from_chars()`
- libcamera: base: log: Remove `LogMessage::init()`
- libcamera: base: log: Make `LogCategory::severity_` atomic
- libcamera: base: log: Use `std::string_view` to avoid some copies
- libcamera: base: log: Pass dynamic prefix through
- libcamera: base: log: Protect log categories with lock
- libcamera: base: log: Avoid manual `LogCategory` deletion
- libcamera: meson: Fix libyuv detection
- libcamera: base: thread: Support dispatching for a specific receiver
- libcamera: base: log: Fix uninitialized variable warning
- libcamera: base: signal: Drop pre-C++17 support
- meson: Add libpisp.wrap
- libcamera: media_object: Fix unnecessary copy
- libcamera: ipa_manager: Store `IPAModule`s in `std::unique_ptr`
- libcamera: base: mutex: Remove unnecessary constructors
- libcamera: media_device: Ignore `lockf()` return value
- libcamera: v4l2_videodevice: `lastUsedCounter_` need not be atomic
- libcamera: camera: Ensure correct id maps are always set
- libcamera: base: span: Explicitly default copy assignment
- libcamera: controls: Check size of enum
- libcamera: camera_manager: Do not emit signals while holding lock
- libcamera: camera_manager: Simplify camera lookup
- libcamera: camera_manager: Take camera id in `std::string_view`
- libcamera: base: object: Forward arguments when invoking
- libcamera: base: bound_method: Simplify `invokePack()`
- libcamera: v4l2_device: add frame start event helpers
- DmaBufAllocator: Make DmaSyncer non-copyable
- Thread: Fix setThreadAffinity race condition in start
- DmaBufAllocator: Avoid syncing with an invalid file descriptor
- controls: Introduce AEGC-related controls
- controls: Remove AeLocked
- controls: Redefine AeEnable
ipa:
- ipa: rpi: Add cam_helper for imx415
- ipa: rpi: Add vc4 tuning files for imx415
- ipa: rpi: Use r-value references in the set()/setLocked() functions
- ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata
- ipa: rpi: Add a HW property to determine if the data buffer is strided
- ipa: rpi: Provide the camera helper with the hardware configuration
- ipa: raspberry: Port to the new AEGC controls
- ipa: rkisp1: Port to the new AEGC controls
- ipa: rkisp1: agc: Report new AeEnable control as available
- ipa: raspberry: Report new AeEnable control as available
- ipa: libipa: lux: Fix indentation
- ipa: rkisp1: agc: Initialize enum controls with a list of values
- ipa: rkisp1: agc: Fix build on debian 11 (gcc-9)
- ipa: rpi: Apply default ControlInfo values for sensor controls
- ipa: Use Vector class from libcamera
- libipa: Drop Vector class
- ipa: rpi: Fix incorrect cast for ExposureTime ControlInfo
- ipa: rkisp1: algorithms: agc: Fix whitespace
- libipa: interpolator: Add accessor to internal data
- libipa: pwl: Add clear() function
- libipa: Add AWB algorithm base class
- libipa: awb: Add helper functions for AWB mode support
- libipa: Add grey world AWB algorithm
- ipa: rkisp1: Move calculation of RGB means into own function
- ipa: rkisp1: Use grey world algorithm from libipa
- libipa: Add bayesian AWB algorithm
- ipa: rkisp1: Add support for bayes AWB algorithm from libipa
- ipa: rkisp1: awb: Apply gains based on default colour temperature on start
- libipa: lux: Normalize referenceY to 1
- libipa: awb_bayes: Add logging of value limits
- libipa: awb_bayes: Remove overly verbose log messages
- libipa: awb_bayes: Change the probabilities from log space to linear space
- libipa: awb: Sort class member documentation according to header order
- libipa: awb: Capitalize AWB
- libipa: awb: Follow function names with '()' in doxygen documentation
- libipa: awb: Standardize spelling on 'grey' world
- libipa: awb: Replace reference to pipeline handle with IPA module
- libipa: awb: Pass lux value to calculateAwb() as unsigned int
- ipa: rkisp1: awb: Fix wrong indentation in comment
- libipa: awb: Rename AwbStats::getRGBMeans() to rgbMeans()
- libipa: awb: Tidy up includes
- libipa: awb_grey: Minor comment fixes
- ipa: rkisp1: awb: Don't calculate RGB means if stats are missing
- ipa: rkisp1: awb: Capitalize AWB
- ipa: rkisp1: algorithms: awb: Fix AWB means vector order in RGB mode
- libipa: awb: Fix non-virtual destructor warning in AwbStats
- ipa: rkisp1: Initialise AGC from FrameDurationLimits controls
- ipa: rkisp1: Alias lineDuration
- ipa: rkisp1: Allow exposure time to be shorter than minimum frame duration limit
- ipa: libipa: Fix bug in ExposureModeHelper that leads to oscillations in AEGC
- utils: ipc: Only dispatch messages for proxy when stopping thread
- ipa: rpi: Add support for Raspberry Pi 5
- ipa: simple: lut: Fix include path
- ipa: rkisp1: agc: Fix metering modes
- ipa: rkisp1: agc: Set measurement window to full frame
- ipa: rkisp1: Add debug log for the sensor controls being set
- ipa: libipa: agc_mean_luminance: Error out when effectiveExposureValue is zero
- ipa: rksip1: Remove setControls(0) to reduce startup oscillations
- ipa: simple: softisp: Extend to pass metadata
- ipa: simple: Report the ColourGains in metadata
- ipa: simple: Report black levels in metadata
- ipa: simple: Report contrast in metadata
- ipa: simple: Report exposure in metadata
- ipa: simple: Initialize ccmEnabled to false
- libipa: histogram: Fix quantile() calculation for fractional results
- libipa: histogram: Fix interQuantileMean() for small ranges
apps:
- gstreamer: allocator: gst_libcamera_allocator_new(): Recognize errors
- gstreamer: allocator: gst_libcamera_allocator_new(): Fix memory leak
- gstreamer: Generate the new AEGC controls
- apps: ppm_writer: Add a missing include
- apps: ppm_writer: Return EIO on I/O errors
- gstreamer: Fix scaler-crop property get
- apps: common: event_loop: Take callbacks by rvalue ref
- apps: common: event_loop: Disable copy/move
- apps: common: event_loop: Use `std::deque` instead of `std::list`
- apps: common: event_loop: Use single event source for deferred calls
- apps: common: event_loop: Remove unused type alias
- apps: lc-compliance: Initialize `CameraManager` pointer in `Environment`
- apps: lc-compliance: Put tests into anonymous namespace
- apps: lc-compliance: Optimize `std::shared_ptr` usage
- apps: lc-compliance: Remove redundant getter call
- apps: lc-compliance: Don't allocate `FrameBufferAllocator` dynamically
- apps: lc-compliance: Use `std::vector` for argument array
- apps: lc-compliance: Use array instead of `std::vector`
- apps: lc-compliance: Add message to `GTEST_SKIP()`
- apps: lc-compliance: Merge `CaptureBalanced` and `CaptureUnbalanced`
- gstreamer: Add Y444 format support to the YUV list
- apps: cam: Fix include order
- apps: qcam: Simplify `PixelFormat` search
- apps: cam: Highlight default enumerator
- gstreamer: Use `Control<>` objects when setting controls
- gstreamer: Restore `AeEnable` control
pipeline:
- libcamera: pipeline: virtual: Demote config file error message to debug
- libcamera: pipeline: Move tuning file override handling to IPAProxy
- libcamera: software_isp: Move a non-loop condition out of the loop
- libcamera: software_isp: Handle signals in the proper thread
- libcamera: pipeline: virtual: Simplify error return
- libcamera: pipeline: virtual: Fill buffer's metadata
- libcamera: pipeline: virtual: Set `FrameError` on error
- libcamera: pipeline: Fix LIBCAMERA_<NAME>_TUNING_FILE handling
- rkisp1: Honor the FrameDurationLimits control
- libcamera: software_isp: Emit ispStatsReady only if IPA is running
- libcamera: software_isp: Handle queued output buffers on stop
- libcamera: software_isp: Handle queued input buffers on stop
- libcamera: software_isp: Dispatch messages on stop
- pipeline: rpi: Add new stream flags for PiSP
- pipeline: rpi: Add support for Raspberry Pi 5
- libcamera: software_isp: Determine color temperature
- libcamera: software_isp: Use RGB type to represent gains
- libcamera: software_isp: Store color temperature to metadata
- libcamera: software_isp: lut: Remove maybe_unused on a used argument
- libcamera: software_isp: Use common code to store debayered pixels
- libcamera: software_isp: Use a macro to assign debayering methods
- libcamera: software_isp: Add CCM algorithm
- libcamera: software_isp: Add an example CCM to uncalibrated.yaml
- libcamera: software_isp: Track whether CCM is enabled
- libcamera: software_isp: Apply CCM in debayering
- pipeline: rpi: pisp: Fix uninitialized variable warning
- libcamera: software_isp: Track frames and requests
- libcamera: software_isp: Reset stored exposure in black level
- libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode` control setup
- libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode` control setting
- pipeline: rpi: Fix potential empty optional read
- pipeline: simple: Connect/disconnect frameStart signal at start/stop time
- pipeline: simple: Enable frame start events
- pipeline: simple: Create DelayedControls instance once only
- pipeline: simple: Reset delayedCtrls at start
documentation:
- Documentation: design: ae: Document the design for AE controls
- Documentation: guides: application-developer: Fix variable shadowing
- Revert "README.rst: Report py dependencies"
test:
- test: ipa_data_serialization: Use DebugMetadataEnable
- test: threads: Use `pthread_testcancel()`
- test: ipa: libipa: Add histogram tests
- test: ipa: libipa: histogram: Add tests for quantile() returning a fraction
- test: ipa: libipa: histogram: Add tests for small inter quantile mean ranges
tuning:
- libtuning: module: awb: Add bayes AWB support
- libtuning: Add module for lux calibration
- utils: tuning: rkisp1: Add lux module
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The interQuantileMean() is supposed to return a weighted mean value
between two quantiles. This works for fine histograms, but fails for
coarse histograms and small quantile ranges because the weight is always
taken from the lower border of the bin.
Fix that by rewriting the algorithm to calculate a lower and upper bound
for every (partial) bin that goes into the mean calculation and weight
the bins by the middle of these bounds.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Add tests for small inter quantile mean ranges. As these cases fail at
the moment, mark the test as should_fail.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
The calculation of the frac variable is based solely on integers and
therefore results in the fractional part being either 0 or 1.
In the original code from RaspberryPi this is mitigated by casting the
nominator to a double. This works for most cases, but fails when q is
very small because of the quantization introduced by item being an
integer.
Fix both issues by doing the full calculation in double and remove the
should_fail tag.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Add tests for quantile() returning a fractional value. These cases will
get fixed in the next commit. Therefore mark the test as should_fail.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Add some basic tests for the histogram class.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Similar like in other pipelines (IPU3, rpi) avoid using stale
values of DelayedControls class when the same camera is started
second time.
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>
Co-developed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The DelayedControls instance for the camera sensor is created in
SimplePipelineHandler::configure(). Constant deletion and reconstruction
of a new object is unnecessary, as the control delays are an intrinsic
property of the sensor and are known at initialization time. Move the
DelayedControls creation to the SimpleCameraData class constructor.
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com> # v6
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The simple pipeline handler uses frame start events to apply sensor
controls through the DelayedControls class. The setSensorControls()
function applies the controls directly, which would result in controls
being applied twice, if it wasn't for the fact that the pipeline handler
forgot to enable the frame start events in the first place. Those two
issues cancel each other, but cause controls to always be applied
directly.
Fix the issue by only applying controls directly in setSensorControls()
if no frame start event emitter is available, and by enabling the frame
start events in startDevice() otherwise. Disable them in stopDevice()
for symmetry.
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com> # v6
Co-developed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Co-developed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The frameStart signal from the frame start emitter is connected in the
configure() function, and is never disconnected. This means that each
time the camera is configured a new connection is made, causing the
DelayedControls::applyControls() to be called multiple times. Fix it by
connecting and disconnecting the signal when starting and stopping the
camera.
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com> # v6
Co-developed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Co-developed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Add helper to check if frame start event are supported by subdevice.
Since kernel does not have interface to query supported events
use subscribe interface.
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> # v3
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> # v5
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
If `!target`, then `*target` is undefined behaviour, so check if the optional
is empty when printing the error message. Simplify the check as well.
Fixes: 6c71ee1f153051 ("pipeline: raspberrypi: Introduce PipelineHandlerBase class")
Fixes: 841ef2b4bb08ba ("pipeline: rpi: Add support for Raspberry Pi 5")
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
|
|
Commit "gstreamer: Generate the new AEGC controls" removed the
`AeEnable` control from gen-gst-controls.py. However, the patch
set it was part of did not end up removing the `AeEnable`
control after all. So restore it for gstreamer users.
See 85cb179f289d29 ("controls: Redefine AeEnable").
Fixes: 187f2d537be5a4 ("gstreamer: Generate the new AEGC controls")
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
`g_value_get_boolean()` returns `gboolean`, which is actually `int`. Thus
// ControlValue x;
auto val = g_value_get_boolean(...);
x.set(val);
will cause `ControlValue::set<int, ...>(const int&)` to be called, which
will save the value as `ControlTypeInteger32`, not `ControlTypeBoolean`.
Then, if something tries to retrieve the boolean value, it will run into an
assertion failure:
Assertion `type_ == details::control_type<std::remove_cv_t<T>>::value' failed.
in `ControlValue::set()`.
Fix this by using the appropriately typed `Control<>` object when setting
the value in the `ControlList` as this ensures that the value will be
converted to the actual type of the control.
Bug: https://bugs.libcamera.org/show_bug.cgi?id=261
Fixes: 27cece6653e530 ("gstreamer: Generate controls from control_ids_*.yaml files")
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
ccmEnabled variable is not initialized by default, which results in
usage of CCM when the algorithm itself is not enabled and configured.
The bug manifests itself as seldom reproducible corrupted video stream.
Fix by initialize ccmEnabled member where it is declared.
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Fixes: ac3068655643 ("libcamera: software_isp: Track whether CCM is enabled")
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The mapping in `UVCCameraData::processControl()` is not entirely correct
because the control value is retrieved as a `bool` instead of `int32_t`.
Additionally, the available modes are not taken into account.
Retrieve the control value with the right type, `int32_t`, check if the
requested mode is available, and if so, set the appropriate V4L2 control
value selected by `addControl()` earlier.
Fixes: bad8d591f8acfa ("libcamera: uvcvideo: Register ExposureTimeMode control")
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
|
|
`ControlInfo(Span<const int32_t>{...})` calls the incorrect constructor
of `ControlInfo`. The intended constructor to be called is
`ControlInfo(Span<const ControlValue>, ...)` however that is not called
because a span of `const int32_t` is passed. Instead, the constructor
`ControlInfo(const ControlValue &min, const ControlValue &max, ...)`
will be called.
Furthermore, since `values.back()` is used, only the last element of
the array is actually set.
To fix this, convert the array to contain `ControlValue` objects and use
a separate variable to keep track of which element to set next.
For each of `ExposureTimeMode{Auto,Manual}` save the V4L2 control value
that is to be used when the libcamera control is set.
Fixes: bad8d591f8acfa ("libcamera: uvcvideo: Register ExposureTimeMode control")
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
|
|
Use `if constexpr` instead of SFINAE to handle return values of type `void`.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Use `std::forward()` to forward the received arguments to enable the
potential use of move constructors instead of copy constructors.
Commit 0eacde623bb0 ("libcamera: object: Avoid argument copies in invokeMethod()")
added the forwarding references to `invokeMethod()` but it did not add the
appropriate `std::forward()` calls, so copying could still take place
even if not necessary.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Do not force the caller to have an `std::string` object as a
simple string view is sufficient to do the lookup.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
`std::find()` works just fine because `std::shared_ptr` has
`operator==()` with the expected semantics.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Automatic black level setting in software ISP updates the determined
black level value when exposure or gain change. It stores the last
exposure and gain values to detect the change.
BlackLevel::configure() resets the stored black level value but not the
exposure and gain values. This can prevent updating the black value and
cause bad image output, e.g. after suspending and resuming a camera, if
exposure and gain remain unchanged.
Let's store exposure and gain in IPAActiveState. Although the values
are not supposed to be used outside BlackLevel class, storing them in
the context has the advantage of their automatic reset together with the
other context contents and having them in `blc' struct indicates their
relationship to the black value computation.
Bug: https://bugs.libcamera.org/show_bug.cgi?id=259
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Tested-by: Robert Mader <robert.mader@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Report exposure and gain in metadata.
This is more complicated than it could be expected because the exposure
value should be in microseconds but it's handled using V4L2_CID_EXPOSURE
control, which doesn't specify the unit, see
https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/control.html.
So the unit conversion is done in the way rkisp1 IPA uses.
This requires getting and passing IPACameraSensorInfo around. To avoid
naming confusion and to improve consistency with rkisp1 IPA,
sensorCtrlInfoMap parameter is renamed to sensorControls.
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Provide the requested contrast value, if any, in the metadata to add to
the completed requests.
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Provide the determined black level values in the metadata
to add to the completed requests.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Provide the determined colour gains back into the metadata
to add to completed requests.
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Extend the Simple IPA IPC to support returning a metadata ControlList
when the process call has completed.
A new signal from the IPA is introduced to report the metadata,
similarly to what the hardware pipelines do.
Merge the metadata reported by the ISP into any completing request to
provide to the application. Completion of a request is delayed until
this is done; this doesn't apply to canceled requests.
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Hardware pipelines track requests and other information related to
particular frames. This hasn't been needed in software ISP so far. But
in order to be able to track metadata corresponding to a given frame,
frame-request tracking mechanism starts being useful. This patch
introduces the basic tracking structure, actual metadata handling is
added in the following patch.
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> # Lenovo X13s
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
The call to setControls(0) is counter productive. At start() time, no
requests were queued and no stats were received. So setControls(0)
accesses a zeroed frame context and in turn sends 0 as gain, exposure
and vblank to the pipeline handler and DelayedControls. This leads to
strong oscillations on every start of the camera.
A proper fix for handling the startup controls still needs to be done
and was already started in [1] and [2].
From a DelayedControls point of view the call to setControls(0) is also
unnecessary as DelayedControls treat frame 0 as already being queued in
after initialization.
So it is safe to just remove it and the removal fixes the zero
effectiveExposureValue discussed in the previous patch for rkisp1.
[1]: https://patchwork.libcamera.org/patch/21708/
[2]: https://patchwork.libcamera.org/patch/22445/
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
In a proper system it never happens that the effectiveExposureValue
drops to zero. If that still happens due to a bug outside of
agc_mean_luminance, the calculated gain goes towards infinity but the
newExposureValue is still 0 because it is the result of multiplying the
effectiveExposureTime with the gain, leading to wild oscillations.
Catch that condition, print an error message and set the new effective
exposure value to an arbitrary 10ms.
Note that in any case the underlying problem must be fixed. The
important change is the added error message to be able to detect such a
situation.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
In the algorithm code a lot of information is logged in debug log level,
but there is no place where the values sent to the sensor get logged.
Add such a log message.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
gcc 13.3.0 from buildroot 2024.11.1 complains about an uninitialized
variable. This is a false positive as the cfe_ array can't be empty.
Nonetheless, it breaks builds, so initialize the variable to work around
the issue.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
With the availability of metering modes and the corresponding weights,
there is a flexible way of defining the area that gets taken into
account when AEGC is calculated. There is no need to reduce that window
to an arbitrary region anymore. If need arises we can make this
parameter user configurable or add a control for it.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The weights for a given metering mode are applied to the histogram data
inside the histogram statistics block. The AE statistics do not contain
any weights. Therefore the weights are honored when AgcMeanLuminance
calculates the upper or lower constraints, but ignored in the
calculation of the frame luminance. Fix that by manually applying the
weights in the luminance calculation.
Fixes: 4c5152843a2a ("ipa: rkisp1: Derive rkisp1::algorithms::Agc from AgcMeanLuminance")
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
This patch applies color correction matrix (CCM) in debayering if the
CCM is specified. Not using CCM must still be supported for performance
reasons.
The CCM is applied as follows:
[r1 g1 b1] [r]
[r2 g2 b2] * [g]
[r3 g3 b3] [b]
The CCM matrix (the left side of the multiplication) is constant during
single frame processing, while the input pixel (the right side) changes.
Because each of the color channels is only 8-bit in software ISP, we can
make 9 lookup tables with 256 input values for multiplications of each
of the r_i, g_i, b_i values. This way we don't have to multiply each
pixel, we can use table lookups and additions instead. Gamma (which is
non-linear and thus cannot be a part of the 9 lookup tables values) is
applied on the final values rounded to integers using another lookup
table.
Because the changing part is the pixel value with three color elements,
only three dynamic table lookups are needed. We use three lookup tables
to represent the multiplied matrix values, each of the tables
corresponding to the given matrix column and pixel color.
We use int16_t to store the precomputed multiplications. This seems to
be noticeably (>10%) faster than `float' for the price of slightly less
accuracy and it covers the range of values that sane CCMs produce. The
selection and structure of data is performance critical, for example
using bytes would add significant (>10%) speedup but would be too short
to cover the value range.
The color lookup tables can be represented either as unions,
accommodating tables for both the CCM and non-CCM cases, or as separate
tables for each of the cases, leaving the tables for the other case
unused. The latter is selected as a matter of preference.
The tables are copied (as before), which is not elegant but also not a
big problem. There are patches posted that use shared buffers for
parameters passing in software ISP (see software ISP TODO #5) and they
can be adjusted for the new parameter format.
Color gains from white balance are supposed not to be a part of the
specified CCM. They are applied on it using matrix multiplication,
which is simple and in correspondence with future additions in the form
of matrix multiplication, like saturation adjustment.
With this patch, the reported per-frame slowdown when applying CCM is
about 45% on Debix Model A and about 75% on TI AM69 SK.
Using std::clamp in debayering adds some performance penalty (a few
percent). The clamping is necessary to eliminate out of range values
possibly produced by the CCM. If it could be avoided by adjusting the
precomputed tables some way then performance could be improved a bit.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Applying color correction matrix (CCM) in software ISP is optional due
to performance reasons. CCM is applied if and only if `Ccm' algorithm
is present in the tuning file.
Software ISP debayering is a performance critical piece of code and we
do not want to use dynamic conditionals there. Therefore we pass
information about CCM application to debayering configuration and let it
select the right versions of debayering functions using templates. This
is a trick similar to the previously used one for adding or not adding
an alpha channel to the output.
Debayering gets this information but it ignores it in this patch.
Actual processing with CCM is added in the followup patch.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
For performance reasons, color correction matrix (CCM) is not applied by
default in software ISP. But let's add a commented out example how to
define it to the default tuning file.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
This patch adds color correction matrix (CCM) algorithm to software ISP.
It is based on the corresponding algorithm in rkisp1.
The primary difference against hardware pipelines is that applying the
CCM is optional. Applying CCM causes a significant slowdown, time
needed to process a frame raises by 40-90% on tested platforms. If CCM
is really needed, it can be applied, if not, it's better to stick
without it. This can be configured by presence or omission of Ccm
algorithm in the tuning file.
CCM is changed only if the determined temperature changes by at least
100 K (an arbitrarily selected value), to avoid recomputing the matrices
and lookup tables all the time.
Since the CCM is float, rather than double, to use the same type as in
the rkisp1 pipeline, the type of color gains is changed from double to
float.
The outputs of the algorithm are not used yet, they will be enabled in
followup patches.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Assignments of the debayering methods to be used is a repetitive pattern
that can be (arguably) better expressed by using a macro. This removes
some duplication and also makes easier to introduce more complex
assignment patterns. This will be useful once color correction matrix
support is added.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The debayering macros use the same pattern, let's extract it to a common
macro. This reduces code duplication a bit now and it'll make changes
of debayering easier when color correction matrix is introduced.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
`params' argument of Lut::prepare is actually used, let's remove
maybe_unused from it.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Image color temperature is a piece of information that should be
reported in metadata, let's put it there.
Metadata is currently not reported in simple pipeline but we should make
at least newly added information ready to be reported.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Rather than using a custom struct to represent RGB values, let's use the
corresponding type and its facilities.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The AWB algorithm has data to determine color temperature of the image.
Let's compute the temperature from it and store it into the context.
This piece of information is currently unused but it will be needed in a
followup patch introducing support for color correction matrix.
Let's store the white balance related information under `awb' subsection
of the active state, as the hardware pipelines do.
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Both `CameraManager::Private::{add,remove}Camera()` emit the
`camera{Added,Removed}` signals, respectively, while holding the
lock protecting the list of cameras.
This is problematic because if a callback tries to call `cameras()`,
then the same (non-recursive) lock would be locked again.
Furthermore, there is no real need to hold the lock while user code
is running, so release the lock as soon as possible.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Harvey Yang <chenghaoyang@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Only enums whose sizes match that of `int32_t` can be directly
supported. Otherwise the expected size and the real size would
disagree, leading to an assertion failure in `ControlValue::set()`.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
The `dynamic_extent` specialization is currently not trivially copyable
unlike its standard counterpart, `std::span`. This is because the copy
assignment operator is user-defined. Explicitly default it just like
it is done in the main template definition.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
`Camera::Private::properties_` is a default constructed `ControlList`,
therefore it does not have an associated `ControlIdMap`. `controlInfo_`
is in a similar situation.
Extend the `Camera::Private` constructor to initialize the control id map
of both properly.
Multiple pipeline handlers copy the sensor's property list and
set that as camera properties, and since the `CameraSensor{Legacy,Raw}`
classes set the proper id map, the camera properties will have it too.
However, some pipelines, e.g. `uvcvideo` or `virtual`, do not do so,
and thus there will be no id map set. To fix this, extend the
`Camera::Private` constructor to set `properties::properties`.
As for `controlInfo_`, all pipeline handlers overwrite it during
camera initialization (and thus it will have the correct id map),
but still initialize the id map so that it is set at all times.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
Use the proper path to include `libcamera/control_ids.h`.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
|
`pthread_testcancel()` is a guaranteed cancellation point,
specifically for testing if cancellation has been requested,
so use it.
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
