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 StreamDivisor enum and work on CameraStreamer

Browse Source
This commit is contained in:
Matt
2019-11-07 16:53:31 -08:00
parent cc2c065dc8
commit 1e7f380f07
10 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main/src/main/java/com/chameleonvision/vision/camera/CameraDeserializer.java
View File

@@ -31,7 +31,7 @@ public class CameraDeserializer implements JsonDeserializer<USBCamera> {
boolean isDriver = isDriverObj != null && isDriverObj.getAsBoolean();
int driverExposure = driverExposureObj == null ? USBCamera.DEFAULT_EXPOSURE : driverExposureObj.getAsInt();
int driverBrightness = driverBrightnessObj == null ? USBCamera.DEFAULT_BRIGHTNESS : driverBrightnessObj.getAsInt();
StreamDivisor divisor = divisorObj == null ? StreamDivisor.none : StreamDivisor.values()[divisorObj.getAsInt()];
StreamDivisor divisor = divisorObj == null ? StreamDivisor.NONE : StreamDivisor.values()[divisorObj.getAsInt()];
var pipelines = jsonObj.get("pipelines");
List<Pipeline> actualPipelines = new ArrayList<>();

8
Main/src/main/java/com/chameleonvision/vision/camera/StreamDivisor.java
View File

@@ -1,10 +1,10 @@
package com.chameleonvision.vision.camera;
public enum StreamDivisor {
none(1),
half(2),
quarter(4),
sixth(6);
NONE(1),
HALF(2),
QUARTER(4),
SIXTH(6);
public final Integer value;

2
Main/src/main/java/com/chameleonvision/vision/camera/USBCamera.java
View File

@@ -16,7 +16,7 @@ import java.util.stream.IntStream;
public class USBCamera {
private static final double DEFAULT_FOV = 60.8;
private static final StreamDivisor DEFAULT_STREAMDIVISOR = StreamDivisor.none;
private static final StreamDivisor DEFAULT_STREAMDIVISOR = StreamDivisor.NONE;
public static final int DEFAULT_EXPOSURE = 50;
public static final int DEFAULT_BRIGHTNESS = 50;
private static final int MINIMUM_FPS = 30;