Moved CvSink/CvSource to Camera class

This commit is contained in:
Banks Troutman
2019-09-20 02:17:22 -04:00
parent afb7872eb6
commit 012aa9559a
20 changed files with 158 additions and 266 deletions

View File

@@ -1,132 +1,148 @@
package com.chameleonvision.vision.camera;
import com.chameleonvision.vision.Pipeline;
import edu.wpi.cscore.UsbCamera;
import edu.wpi.cscore.UsbCameraInfo;
import edu.wpi.cscore.VideoMode;
import edu.wpi.cscore.*;
import edu.wpi.first.cameraserver.CameraServer;
import org.opencv.core.Mat;
import java.util.HashMap;
import java.util.stream.IntStream;
public class Camera {
private static double defaultFOV = 60.8;
private static double defaultFOV = 60.8;
public final String name;
public final String path;
public final String name;
public final String path;
public final UsbCamera UsbCam;
private final UsbCameraInfo UsbCamInfo;
private final VideoMode[] availableVideoModes;
public final UsbCamera UsbCam;
private final UsbCameraInfo UsbCamInfo;
private final VideoMode[] availableVideoModes;
private final CvSink cvSink;
private final CvSource cvSource;
private double FOV;
private double FOV;
private CameraValues camVals;
private CamVideoMode camVideoMode;
private CameraValues camVals;
private CamVideoMode camVideoMode;
private int currentPipelineIndex;
private HashMap<Integer, Pipeline> pipelines = new HashMap<>();
private int currentPipelineIndex;
private HashMap<Integer, Pipeline> pipelines = new HashMap<>();
public Camera(String cameraName) {
this(cameraName, defaultFOV);
public Camera(String cameraName) {
this(cameraName, defaultFOV);
}
public Camera(UsbCameraInfo usbCamInfo) {
this(usbCamInfo, defaultFOV);
}
public Camera(String cameraName, double fov) {
this(CameraManager.AllUsbCameraInfosByName.get(cameraName), fov);
}
public Camera(UsbCameraInfo usbCamInfo, double fov) {
UsbCamInfo = usbCamInfo;
FOV = fov;
name = usbCamInfo.name;
path = usbCamInfo.path;
UsbCam = new UsbCamera(name, path);
// set up video mode
availableVideoModes = UsbCam.enumerateVideoModes();
setCamVideoMode(new CamVideoMode(availableVideoModes[0]));
CameraServer cs = CameraServer.getInstance();
cvSink = cs.getVideo(UsbCam);
cvSource = cs.putVideo(name, camVals.ImageWidth, camVals.ImageHeight);
}
public void setCamVideoMode(int videoMode) {
setCamVideoMode(UsbCam.enumerateVideoModes()[videoMode]);
}
private void setCamVideoMode(VideoMode videoMode) {
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);
camVals = new CameraValues(this);
// TODO: Automatically restart CameraProcess when resolution changes (not FPS)
}
public void addPipeline() {
addPipeline(pipelines.size());
}
private void addPipeline(int pipelineNumber) {
if (pipelines.containsKey(pipelineNumber)) return;
pipelines.put(pipelineNumber, new Pipeline());
}
public Pipeline getCurrentPipeline() {
return pipelines.get(currentPipelineIndex);
}
public int getCurrentPipelineIndex() {
return currentPipelineIndex;
}
public void setCurrentPipelineIndex(int pipelineNumber) {
if (pipelineNumber - 1 > pipelines.size()) return;
currentPipelineIndex = pipelineNumber;
}
public HashMap<Integer, Pipeline> getPipelines() {
return pipelines;
}
public CamVideoMode getVideoMode() {
return camVideoMode;
}
public int getVideoModeIndex() {
return IntStream.range(0, availableVideoModes.length)
.filter(i -> camVideoMode.isEqualToVideoMode(availableVideoModes[i]))
.findFirst()
.orElse(-1);
}
public double getFOV() {
return FOV;
}
public void setFOV(double fov) {
FOV = fov;
camVals = new CameraValues(this);
}
public int getBrightness() {
return getCurrentPipeline().brightness;
}
public void setBrightness(int brightness) {
getCurrentPipeline().brightness = brightness;
UsbCam.setBrightness(brightness);
}
public void setExposure(int exposure) {
getCurrentPipeline().exposure = exposure;
UsbCam.setExposureManual(exposure);
}
public long grabFrame(Mat image) {
return cvSink.grabFrame(image);
}
public Camera(UsbCameraInfo usbCamInfo) {
this(usbCamInfo, defaultFOV);
public long grabFrame(Mat image, double timeout) {
return cvSink.grabFrame(image, timeout);
}
public Camera(String cameraName, double fov) {
this(CameraManager.AllUsbCameraInfosByName.get(cameraName), fov);
public void putFrame(Mat image) {
cvSource.putFrame(image);
}
public Camera(UsbCameraInfo usbCamInfo, double fov) {
UsbCamInfo = usbCamInfo;
FOV = fov;
name = usbCamInfo.name;
path = usbCamInfo.path;
UsbCam = new UsbCamera(name, path);
// set up video mode
availableVideoModes = UsbCam.enumerateVideoModes();
setCamVideoMode(new CamVideoMode(availableVideoModes[0]));
}
public void setCamVideoMode(int videoMode) {
setCamVideoMode(UsbCam.enumerateVideoModes()[videoMode]);
}
private void setCamVideoMode(VideoMode videoMode) {
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);
camVals = new CameraValues(this);
// TODO: Automatically restart CameraProcess when resolution changes (not FPS)
}
public void addPipeline() {
addPipeline(pipelines.size());
}
private void addPipeline(int pipelineNumber) {
if (pipelines.containsKey(pipelineNumber)) return;
pipelines.put(pipelineNumber, new Pipeline());
}
public void setCurrentPipelineIndex(int pipelineNumber) {
if (pipelineNumber - 1 > pipelines.size()) return;
currentPipelineIndex = pipelineNumber;
}
public Pipeline getCurrentPipeline() {
return pipelines.get(currentPipelineIndex);
}
public int getCurrentPipelineIndex() {
return currentPipelineIndex;
}
public HashMap<Integer, Pipeline> getPipelines() {
return pipelines;
}
public CamVideoMode getVideoMode() {
return camVideoMode;
}
public int getVideoModeIndex() {
return IntStream.range(0, availableVideoModes.length)
.filter(i -> camVideoMode.isEqualToVideoMode(availableVideoModes[i]))
.findFirst()
.orElse(-1);
}
public void setFOV(double fov) {
FOV = fov;
camVals = new CameraValues(this);
}
public double getFOV() {
return FOV;
}
public void setBrightness(int brightness) {
getCurrentPipeline().brightness = brightness;
UsbCam.setBrightness(brightness);
}
public int getBrightness() {
return getCurrentPipeline().brightness;
}
public void setExposure(int exposure) {
getCurrentPipeline().exposure = exposure;
UsbCam.setExposureManual(exposure);
}
}

View File

@@ -23,20 +23,23 @@ import java.util.List;
public class CameraManager {
public static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "Cams");
private static final Path CamConfigPath = Paths.get(SettingsManager.SettingsPath.toString(), "Cams");
// TODO: Fix suffix for camera
// TODO: throw a camera Exeption if no camera is connected
// TODO: throw a camera Exception if no camera is connected
static HashMap<String, UsbCameraInfo> AllUsbCameraInfosByName = new HashMap<>() {{
var suffix = 0;
for (var info : UsbCamera.enumerateUsbCameras()) {
var cap = new VideoCapture(info.name);
if (cap.isOpened()) {
cap.release();
var name = String.format("%s(%s)", info.name, suffix);
put(name, info);
}
var name = info.name;
while (this.containsKey(name)) {
suffix++;
}
name = String.format("%s(%s)", info.name, suffix);
}
put(name, info);
}
}};
@@ -78,7 +81,7 @@ public class CameraManager {
return true;
}
public static Camera getCamera(String cameraName) {
private static Camera getCamera(String cameraName) {
return AllCamerasByName.get(cameraName);
}