Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-19 00:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if libcamera fails to load (#2498)

Browse Source
This commit is contained in:
Alan Everett
2026-05-19 23:42:09 -04:00
committed by GitHub
parent 645ff41ce9
commit c146d559d0
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
photon-core/src/main/java/org/photonvision/vision/camera/csi/LibcameraGpuSettables.java
View File

@@ -63,7 +63,14 @@ public class LibcameraGpuSettables extends VisionSourceSettables {
videoModes = new HashMap<>();
sensorModel = LibCameraJNI.getSensorModel(configuration.matchedCameraInfo.path());
LibCameraJNI.SensorModel tempSensorModel;
try {
tempSensorModel = LibCameraJNI.getSensorModel(configuration.matchedCameraInfo.path());
} catch (UnsatisfiedLinkError e) {
logger.error("Unable to load libcamera JNI", e);
tempSensorModel = LibCameraJNI.SensorModel.Disconnected;
}
sensorModel = tempSensorModel;
if (sensorModel == LibCameraJNI.SensorModel.IMX219) {
// Settings for the IMX219 sensor, which is used on the Pi Camera Module v2

12
photon-core/src/main/java/org/photonvision/vision/frame/provider/LibcameraGpuFrameProvider.java
View File

@@ -146,11 +146,15 @@ public class LibcameraGpuFrameProvider extends FrameProvider {
@Override
public boolean checkCameraConnected() {
String[] cameraNames = LibCameraJNI.getCameraNames();
for (String name : cameraNames) {
if (name.equals(settables.getConfiguration().getDevicePath())) {
return true;
try {
String[] cameraNames = LibCameraJNI.getCameraNames();
for (String name : cameraNames) {
if (name.equals(settables.getConfiguration().getDevicePath())) {
return true;
}
}
} catch (UnsatisfiedLinkError e) {
// libcamera failed to load; ignored
}
return false;
}