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

Camera configuration rewrite, begin on CameraStreamer threading fix

Browse Source
This commit is contained in:
Banks Troutman
2019-11-26 17:57:51 -05:00
parent 6506281ddf
commit d588b1a69e
11 changed files with 293 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Main/src/main/java/com/chameleonvision/vision/camera/USBCameraCapture.java
View File

@@ -1,6 +1,6 @@
package com.chameleonvision.vision.camera;
import com.chameleonvision.config.CameraConfig;
import com.chameleonvision.config.CameraJsonConfig;
import edu.wpi.cscore.CvSink;
import edu.wpi.cscore.UsbCamera;
import edu.wpi.cscore.VideoException;
@@ -15,7 +15,7 @@ public class USBCameraCapture implements CameraCapture {
private Mat imageBuffer = new Mat();
private USBCameraProperties properties;
public USBCameraCapture(CameraConfig config) {
public USBCameraCapture(CameraJsonConfig config) {
baseCamera = new UsbCamera(config.name, config.path);
cvSink = CameraServer.getInstance().getVideo(baseCamera);
properties = new USBCameraProperties(baseCamera, config);

4
Main/src/main/java/com/chameleonvision/vision/camera/USBCameraProperties.java
View File

@@ -1,6 +1,6 @@
package com.chameleonvision.vision.camera;
import com.chameleonvision.config.CameraConfig;
import com.chameleonvision.config.CameraJsonConfig;
import com.chameleonvision.util.Platform;
import com.chameleonvision.vision.image.CaptureProperties;
import edu.wpi.cscore.UsbCamera;
@@ -40,7 +40,7 @@ public class USBCameraProperties extends CaptureProperties {
private String nickname;
public double FOV;
USBCameraProperties(UsbCamera baseCamera, CameraConfig config) {
USBCameraProperties(UsbCamera baseCamera, CameraJsonConfig config) {
FOV = config.fov;
name = config.name;
path = config.path;