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

fix CSI camera null quirks error (#1349)

Browse Source 
temp fix for this issue with csi cameras
This commit is contained in:
Cameron (3539)
2024-06-19 19:09:52 -04:00
committed by GitHub
parent 8f0cc0ab8b
commit 1d9810505a
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
photon-core/src/main/java/org/photonvision/vision/camera/FileVisionSource.java
View File

@@ -44,6 +44,10 @@ public class FileVisionSource extends VisionSource {
cameraConfiguration.FOV,
FileFrameProvider.MAX_FPS,
calibration);
if (getCameraConfiguration().cameraQuirks == null)
getCameraConfiguration().cameraQuirks = QuirkyCamera.DefaultCamera;
settables =
new FileSourceSettables(cameraConfiguration, frameProvider.get().frameStaticProperties);
}

3
photon-core/src/main/java/org/photonvision/vision/camera/LibcameraGpuSource.java
View File

@@ -41,6 +41,9 @@ public class LibcameraGpuSource extends VisionSource {
"GPUAcceleratedPicamSource only accepts CameraConfigurations with type Picam");
}
if (getCameraConfiguration().cameraQuirks == null)
getCameraConfiguration().cameraQuirks = QuirkyCamera.ZeroCopyPiCamera;
settables = new LibcameraGpuSettables(configuration);
frameProvider = new LibcameraGpuFrameProvider(settables);
}

13
photon-core/src/main/java/org/photonvision/vision/processes/VisionModule.java
View File

@@ -46,7 +46,6 @@ import org.photonvision.vision.camera.CameraQuirk;
import org.photonvision.vision.camera.CameraType;
import org.photonvision.vision.camera.LibcameraGpuSource;
import org.photonvision.vision.camera.QuirkyCamera;
import org.photonvision.vision.camera.USBCameraSource;
import org.photonvision.vision.frame.Frame;
import org.photonvision.vision.frame.consumer.FileSaveFrameConsumer;
import org.photonvision.vision.frame.consumer.MJPGFrameConsumer;
@@ -98,14 +97,10 @@ public class VisionModule {
visionSource.getSettables().getConfiguration().nickname,
LogGroup.VisionModule);
// Find quirks for the current camera
if (visionSource instanceof USBCameraSource) {
cameraQuirks = ((USBCameraSource) visionSource).getCameraQuirks();
} else if (visionSource instanceof LibcameraGpuSource) {
cameraQuirks = QuirkyCamera.ZeroCopyPiCamera;
} else {
cameraQuirks = QuirkyCamera.DefaultCamera;
}
cameraQuirks = visionSource.getCameraConfiguration().cameraQuirks;
if (visionSource.getCameraConfiguration().cameraQuirks == null)
visionSource.getCameraConfiguration().cameraQuirks = QuirkyCamera.DefaultCamera;
// We don't show gain if the config says it's -1. So check here to make sure it's non-negative
// if it _is_ supported

3
photon-core/src/test/java/org/photonvision/vision/processes/VisionModuleManagerTest.java
View File

@@ -31,6 +31,7 @@ import org.photonvision.common.configuration.CameraConfiguration;
import org.photonvision.common.configuration.ConfigManager;
import org.photonvision.common.dataflow.CVPipelineResultConsumer;
import org.photonvision.common.util.TestUtils;
import org.photonvision.vision.camera.QuirkyCamera;
import org.photonvision.vision.camera.USBCameraSource;
import org.photonvision.vision.frame.FrameProvider;
import org.photonvision.vision.frame.FrameStaticProperties;
@@ -49,6 +50,8 @@ public class VisionModuleManagerTest {
public TestSource(FrameProvider provider, CameraConfiguration cameraConfiguration) {
super(cameraConfiguration);
this.provider = provider;
if (getCameraConfiguration().cameraQuirks == null)
getCameraConfiguration().cameraQuirks = QuirkyCamera.DefaultCamera;
}
@Override