| Message ID | 20251120233347.5046-13-bryan.odonoghue@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi 2025. 11. 21. 0:33 keltezéssel, Bryan O'Donoghue írta: > If GPUISP support is available make it so an environment variable can > switch it on. > > Given we don't have full feature parity with CPUISP just yet on pixel > format output, we should default to CPUISP mode giving the user the option > to switch on GPUISP by setting LIBCAMERA_SOFTISP_MODE=gpu > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > src/libcamera/software_isp/software_isp.cpp | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp > index aa4a40cb6..7d21f191c 100644 > --- a/src/libcamera/software_isp/software_isp.cpp > +++ b/src/libcamera/software_isp/software_isp.cpp > @@ -15,6 +15,7 @@ > > #include <libcamera/base/log.h> > #include <libcamera/base/thread.h> > +#include <libcamera/base/utils.h> > > #include <libcamera/controls.h> > #include <libcamera/formats.h> > @@ -25,6 +26,9 @@ > #include "libcamera/internal/software_isp/debayer_params.h" > > #include "debayer_cpu.h" > +#if HAVE_DEBAYER_EGL > +#include "debayer_egl.h" > +#endif > > /** > * \file software_isp.cpp > @@ -117,7 +121,20 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, > } > stats->statsReady.connect(this, &SoftwareIsp::statsReady); > > - debayer_ = std::make_unique<DebayerCpu>(std::move(stats), configuration); > +#if HAVE_DEBAYER_EGL > + const char *softISPMode = utils::secure_getenv("LIBCAMERA_SOFTISP_MODE"); > + > + if (softISPMode && !strcmp(softISPMode, "gpu")) > + debayer_ = std::make_unique<DebayerEGL>(std::move(stats), configuration); > +#endif > + if (!debayer_) > + debayer_ = std::make_unique<DebayerCpu>(std::move(stats), configuration); It's a small thing, but I feel like if `LIBCAMERA_SOFTISP_MODE=gpu` and it is not available, then that should be a fatal error. Regards, Barnabás Pőcze > + > + if (!debayer_) { > + LOG(SoftwareIsp, Error) << "Failed to create Debayer object"; > + return; > + } > + > debayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady); > debayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady); > > -- > 2.51.2 >
diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index aa4a40cb6..7d21f191c 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -15,6 +15,7 @@ #include <libcamera/base/log.h> #include <libcamera/base/thread.h> +#include <libcamera/base/utils.h> #include <libcamera/controls.h> #include <libcamera/formats.h> @@ -25,6 +26,9 @@ #include "libcamera/internal/software_isp/debayer_params.h" #include "debayer_cpu.h" +#if HAVE_DEBAYER_EGL +#include "debayer_egl.h" +#endif /** * \file software_isp.cpp @@ -117,7 +121,20 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, } stats->statsReady.connect(this, &SoftwareIsp::statsReady); - debayer_ = std::make_unique<DebayerCpu>(std::move(stats), configuration); +#if HAVE_DEBAYER_EGL + const char *softISPMode = utils::secure_getenv("LIBCAMERA_SOFTISP_MODE"); + + if (softISPMode && !strcmp(softISPMode, "gpu")) + debayer_ = std::make_unique<DebayerEGL>(std::move(stats), configuration); +#endif + if (!debayer_) + debayer_ = std::make_unique<DebayerCpu>(std::move(stats), configuration); + + if (!debayer_) { + LOG(SoftwareIsp, Error) << "Failed to create Debayer object"; + return; + } + debayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady); debayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady);
If GPUISP support is available make it so an environment variable can switch it on. Given we don't have full feature parity with CPUISP just yet on pixel format output, we should default to CPUISP mode giving the user the option to switch on GPUISP by setting LIBCAMERA_SOFTISP_MODE=gpu Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- src/libcamera/software_isp/software_isp.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)