| Message ID | 20260113000808.15395-36-laurent.pinchart@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
2026. 01. 13. 1:08 keltezéssel, Laurent Pinchart írta: > The pipelines.simple.supported_devices configuration entry list > per-device options for the simple pipeline handler. Rename > "supported_devices" to "devices" to indicate its role more clearly. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > Documentation/runtime_configuration.rst | 6 +++--- > src/libcamera/pipeline/simple/simple.cpp | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst > index 8c920978648d..19c2309ac94f 100644 > --- a/Documentation/runtime_configuration.rst > +++ b/Documentation/runtime_configuration.rst > @@ -43,7 +43,7 @@ file structure: > - ... # pipeline name > pipelines: > simple: > - supported_devices: > + devices: > - driver: # driver name, e.g. `mxc-isi` > software_isp: # true/false > software_isp: > @@ -76,7 +76,7 @@ Configuration file example > - simple > pipelines: > simple: > - supported_devices: > + devices: > - driver: mxc-isi > software_isp: true > software_isp: > @@ -139,7 +139,7 @@ LIBCAMERA_<NAME>_TUNING_FILE > > Example value: ``/usr/local/share/libcamera/ipa/rpi/vc4/custom_sensor.json`` > > -pipelines.simple.supported_devices.driver, pipelines.simple.supported_devices.software_isp > +pipelines.simple.devices.driver, pipelines.simple.devices.software_isp > Override whether software ISP is enabled for the given driver. > > Example `driver` value: ``mxc-isi`` > diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp > index bdc87d39ef0b..0ae9e081f01a 100644 > --- a/src/libcamera/pipeline/simple/simple.cpp > +++ b/src/libcamera/pipeline/simple/simple.cpp > @@ -1881,7 +1881,7 @@ bool SimplePipelineHandler::matchDevice(std::shared_ptr<MediaDevice> media, > swIspEnabled_ = info.swIspEnabled; > const GlobalConfiguration &configuration = cameraManager()->_d()->configuration(); > for (GlobalConfiguration::Option entry : > - configuration.configuration()["pipelines"]["simple"]["supported_devices"] > + configuration.configuration()["pipelines"]["simple"]["devices"] > .asList()) { > auto name = entry["driver"].get<std::string>(); > if (name == info.driver) {
diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst index 8c920978648d..19c2309ac94f 100644 --- a/Documentation/runtime_configuration.rst +++ b/Documentation/runtime_configuration.rst @@ -43,7 +43,7 @@ file structure: - ... # pipeline name pipelines: simple: - supported_devices: + devices: - driver: # driver name, e.g. `mxc-isi` software_isp: # true/false software_isp: @@ -76,7 +76,7 @@ Configuration file example - simple pipelines: simple: - supported_devices: + devices: - driver: mxc-isi software_isp: true software_isp: @@ -139,7 +139,7 @@ LIBCAMERA_<NAME>_TUNING_FILE Example value: ``/usr/local/share/libcamera/ipa/rpi/vc4/custom_sensor.json`` -pipelines.simple.supported_devices.driver, pipelines.simple.supported_devices.software_isp +pipelines.simple.devices.driver, pipelines.simple.devices.software_isp Override whether software ISP is enabled for the given driver. Example `driver` value: ``mxc-isi`` diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index bdc87d39ef0b..0ae9e081f01a 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -1881,7 +1881,7 @@ bool SimplePipelineHandler::matchDevice(std::shared_ptr<MediaDevice> media, swIspEnabled_ = info.swIspEnabled; const GlobalConfiguration &configuration = cameraManager()->_d()->configuration(); for (GlobalConfiguration::Option entry : - configuration.configuration()["pipelines"]["simple"]["supported_devices"] + configuration.configuration()["pipelines"]["simple"]["devices"] .asList()) { auto name = entry["driver"].get<std::string>(); if (name == info.driver) {
The pipelines.simple.supported_devices configuration entry list per-device options for the simple pipeline handler. Rename "supported_devices" to "devices" to indicate its role more clearly. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- Documentation/runtime_configuration.rst | 6 +++--- src/libcamera/pipeline/simple/simple.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)