<div dir="ltr"><div dir="ltr">Hi David,<div><br></div><div>Thank you for your work.</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 7 Jul 2021 at 14:40, David Plowman <<a href="mailto:david.plowman@raspberrypi.com">david.plowman@raspberrypi.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The configuration (camera tuning) file used by the Raspberry Pi comes<br>
by default from the sensor name. However, we now allow this to be<br>
overridden by the LIBCAMERA_RPI_TUNING_FILE environment variable.<br>
<br>
Signed-off-by: David Plowman <<a href="mailto:david.plowman@raspberrypi.com" target="_blank">david.plowman@raspberrypi.com</a>><br></blockquote><div><br></div><div>Reviewed-by: Naushir Patuck <<a href="mailto:naush@raspberrypi.com">naush@raspberrypi.com</a>></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
 src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 14 ++++++++++++--<br>
 1 file changed, 12 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp<br>
index 082eb1ee..a738770a 100644<br>
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp<br>
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp<br>
@@ -1232,8 +1232,18 @@ int RPiCameraData::loadIPA(ipa::RPi::SensorConfig *sensorConfig)<br>
        ipa_->setIspControls.connect(this, &RPiCameraData::setIspControls);<br>
        ipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls);<br>
<br>
-       IPASettings settings(ipa_->configurationFile(sensor_->model() + ".json"),<br>
-                            sensor_->model());<br>
+       /*<br>
+        * The configuration (tuning file) is made from the sensor name unless<br>
+        * the environment variable overrides it.<br>
+        */<br>
+       std::string configurationFile;<br>
+       char const *configFromEnv = utils::secure_getenv("LIBCAMERA_RPI_TUNING_FILE");<br>
+       if (!configFromEnv || *configFromEnv == '\0')<br>
+               configurationFile = ipa_->configurationFile(sensor_->model() + ".json");<br>
+       else<br>
+               configurationFile = std::string(configFromEnv);<br>
+<br>
+       IPASettings settings(configurationFile, sensor_->model());<br>
<br>
        return ipa_->init(settings, sensorConfig);<br>
 }<br>
-- <br>
2.20.1<br>
<br>
</blockquote></div></div>