diff options
| author | Naushir Patuck <naush@raspberrypi.com> | 2023-11-08 13:44:20 +0000 |
|---|---|---|
| committer | Naushir Patuck <naush@raspberrypi.com> | 2023-11-29 09:05:38 +0000 |
| commit | 0455bbbf518cc834bd72ac65e13c9ed40bf21f3c (patch) | |
| tree | 97fec38bd5b40cf14e411f425fd31261b4124351 /src/libcamera | |
| parent | bba4ec63c4b0699b7f7ffb20e4f37af2b996d355 (diff) | |
build: controls: Rework how controls and properties are generated
Add support for using separate YAML files for controls and properties
generation. The mapping of vendor/pipeline handler to control file is
done through the controls_map variable in include/libcamera/meson.build.
This simplifies management of vendor control definitions and avoids
possible merge conflicts when changing the control_ids.yaml file for
core and draft controls. With this change, libcamera and draft controls
and properties files are designated the 'libcamera' vendor tag.
In this change, we also rename control_ids.yaml -> control_ids_core.yaml
and property_ids.yaml -> property_ids_core.yaml to designate these as
core libcamera controls.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/libcamera')
| -rw-r--r-- | src/libcamera/control_ids_core.yaml (renamed from src/libcamera/control_ids.yaml) | 0 | ||||
| -rw-r--r-- | src/libcamera/meson.build | 21 | ||||
| -rw-r--r-- | src/libcamera/property_ids_core.yaml (renamed from src/libcamera/property_ids.yaml) | 0 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids_core.yaml index ff74ce1d..ff74ce1d 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids_core.yaml diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 05ee38da..6d9902e6 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -127,12 +127,23 @@ endif control_sources = [] -foreach source, mode : control_source_files - input_files = files(source +'.yaml') - template_file = files(source + '.cpp.in') - control_sources += custom_target(source + '_cpp', +controls_mode_files = { + 'controls' : controls_files, + 'properties' : properties_files, +} + +foreach mode, input_files : controls_mode_files + input_files = files(input_files) + + if mode == 'controls' + template_file = files('control_ids.cpp.in') + else + template_file = files('property_ids.cpp.in') + endif + + control_sources += custom_target(mode + '_cpp', input : input_files, - output : source + '.cpp', + output : mode + '_ids.cpp', command : [gen_controls, '-o', '@OUTPUT@', '--mode', mode, '-t', template_file, '@INPUT@']) endforeach diff --git a/src/libcamera/property_ids.yaml b/src/libcamera/property_ids_core.yaml index 45f3609b..45f3609b 100644 --- a/src/libcamera/property_ids.yaml +++ b/src/libcamera/property_ids_core.yaml |