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

Allow resolution change to take effect without restarting CameraProcess

Browse Source
This commit is contained in:
Banks Troutman
2019-09-20 02:30:19 -04:00
parent 012aa9559a
commit 07c21aca1d
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
View File

@@ -18,8 +18,10 @@ public class Camera {
public final UsbCamera UsbCam;
private final UsbCameraInfo UsbCamInfo;
private final VideoMode[] availableVideoModes;
private final CameraServer cs = CameraServer.getInstance();
private final CvSink cvSink;
private final CvSource cvSource;
private CvSource cvSource;
private double FOV;
@@ -53,7 +55,6 @@ public class Camera {
availableVideoModes = UsbCam.enumerateVideoModes();
setCamVideoMode(new CamVideoMode(availableVideoModes[0]));
CameraServer cs = CameraServer.getInstance();
cvSink = cs.getVideo(UsbCam);
cvSource = cs.putVideo(name, camVals.ImageWidth, camVals.ImageHeight);
}
@@ -66,13 +67,18 @@ public class Camera {
setCamVideoMode(new CamVideoMode(videoMode));
}
private void setCamVideoMode(CamVideoMode camVideoMode) {
this.camVideoMode = camVideoMode;
UsbCam.setPixelFormat(camVideoMode.getActualPixelFormat());
UsbCam.setFPS(camVideoMode.fps);
UsbCam.setResolution(camVideoMode.width, camVideoMode.height);
private void setCamVideoMode(CamVideoMode newVideoMode) {
var prevVideoMode = this.camVideoMode;
this.camVideoMode = newVideoMode;
UsbCam.setPixelFormat(newVideoMode.getActualPixelFormat());
UsbCam.setFPS(newVideoMode.fps);
UsbCam.setResolution(newVideoMode.width, newVideoMode.height);
// update camera values
camVals = new CameraValues(this);
// TODO: Automatically restart CameraProcess when resolution changes (not FPS)
if ( prevVideoMode != null && prevVideoMode.width != newVideoMode.width && prevVideoMode.height != newVideoMode.height) { // if resolution changed
cvSource = cs.putVideo(name, newVideoMode.width, newVideoMode.height);
}
}
public void addPipeline() {

4
Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
View File

@@ -48,10 +48,6 @@ public class CameraProcess implements Runnable {
private Scalar contourRectColor = new Scalar(255, 0, 0);
private long TimeStamp = 0;
public void restartProcess() {
// TODO: Restart process and re-create cvPublish for new resolution
}
private void DriverModeListener(EntryNotification entryNotification) {
if (entryNotification.value.getBoolean()) {
camera.setExposure(25);