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

Rename USBCamera to USBCameraProcess & abstractify

Browse Source 
- Most classes now take a CameraProcess instead of a USBCameraProcess
This commit is contained in:
Matt
2019-11-07 09:10:09 -08:00
parent 338c59e783
commit cc2c065dc8
9 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main/src/main/java/com/chameleonvision/classabstraction/camera/CameraProcess.java
View File

@@ -4,6 +4,8 @@ import org.apache.commons.lang3.tuple.Pair;
import org.opencv.core.Mat;
public interface CameraProcess {
CameraProperties getProperties();
Pair<Mat, Long> getFrame(Mat frame);
void setExposure(int exposure);

15
Main/src/main/java/com/chameleonvision/classabstraction/camera/USBCamera.java → Main/src/main/java/com/chameleonvision/classabstraction/camera/USBCameraProcess.java
View File

@@ -8,19 +8,24 @@ import edu.wpi.first.cameraserver.CameraServer;
import org.apache.commons.lang3.tuple.Pair;
import org.opencv.core.Mat;
public class USBCamera implements CameraProcess {
public class USBCameraProcess implements CameraProcess {
private final UsbCamera baseCamera;
public final CameraProperties properties;
private final CvSink cvSink;
private Mat imageBuffer = new Mat();
public final CameraProperties properties;
public USBCamera(UsbCamera camera, double fov) {
public USBCameraProcess(UsbCamera camera, double fov) {
baseCamera = camera;
cvSink = CameraServer.getInstance().getVideo(baseCamera);
VideoMode vidMode = new VideoMode(VideoMode.PixelFormat.kYUYV, 640, 480, 60);
properties = new CameraProperties(baseCamera, fov);
}
@Override
public CameraProperties getProperties() {
return properties;
}
@Override
public Pair<Mat, Long> getFrame(Mat frame) {
var timestamp = System.nanoTime();
@@ -34,7 +39,7 @@ public class USBCamera implements CameraProcess {
try {
baseCamera.setExposureManual(exposure);
} catch (VideoException e) {
System.err.println("USBCamera Does not support exposure change");
System.err.println("USBCameraProcess Does not support exposure change");
}
}
@@ -43,7 +48,7 @@ public class USBCamera implements CameraProcess {
try {
baseCamera.setBrightness(brightness);
} catch (VideoException e) {
System.err.println("USBCamera Does not support brightness change");
System.err.println("USBCameraProcess Does not support brightness change");
}
}
}