NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

build: controls: Rework how controls and properties are generated

Browse source 
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>
This commit is contained in:
Naushir Patuck 2023-11-08 13:44:20 +00:00
parent bba4ec63c4
commit 0455bbbf51
9 changed files with 87 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/py/libcamera/gen-py-controls.py
View file

@ -95,7 +95,7 @@ def main(argv):
help='Output file name. Defaults to standard output if not specified.')
parser.add_argument('--template', '-t', type=str, required=True,
help='Template file name.')
parser.add_argument('input', type=str,
parser.add_argument('input', type=str, nargs='+',
help='Input file name.')
args = parser.parse_args(argv[1:])
@ -103,11 +103,11 @@ def main(argv):
print(f'Invalid mode option "{args.mode}"', file=sys.stderr)
return -1
data = open(args.input, 'rb').read()
controls = {}
vendor = yaml.safe_load(data)['vendor']
controls[vendor] = yaml.safe_load(data)['controls']
for input in args.input:
data = open(input, 'rb').read()
vendor = yaml.safe_load(data)['vendor']
controls[vendor] = yaml.safe_load(data)['controls']
data = generate_py(controls, args.mode)

12
src/py/libcamera/meson.build
View file

@ -28,11 +28,15 @@ pycamera_sources = files([
# Generate controls
gen_py_controls_input_files = files('../../libcamera/control_ids.yaml')
gen_py_controls_input_files = []
gen_py_controls_template = files('py_controls_generated.cpp.in')
gen_py_controls = files('gen-py-controls.py')
foreach file : controls_files
gen_py_controls_input_files += files('../../libcamera/' + file)
endforeach
pycamera_sources += custom_target('py_gen_controls',
input : gen_py_controls_input_files,
output : ['py_controls_generated.cpp'],
@ -41,9 +45,13 @@ pycamera_sources += custom_target('py_gen_controls',
# Generate properties
gen_py_property_enums_input_files = files('../../libcamera/property_ids.yaml')
gen_py_property_enums_input_files = []
gen_py_properties_template = files('py_properties_generated.cpp.in')
foreach file : properties_files
gen_py_property_enums_input_files += files('../../libcamera/' + file)
endforeach
pycamera_sources += custom_target('py_gen_properties',
input : gen_py_property_enums_input_files,
output : ['py_properties_generated.cpp'],