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

WIP stream divisor

Browse Source 
set enum for stream divisor
This commit is contained in:
ori agranat
2019-10-16 08:10:06 +03:00
parent c2fd34ed60
commit 0828d2290a
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ public class Camera {
private final Object cvSourceLock = new Object();
private CvSource cvSource;
private float FOV;
private int streamDivisor;
private CameraValues camVals;
private CamVideoMode camVideoMode;
private int currentPipelineIndex;
@@ -138,11 +139,16 @@ public class Camera {
public int getCurrentPipelineIndex() {
return currentPipelineIndex;
}
public void setCurrentPipelineIndex(int pipelineNumber) {
if (pipelineNumber - 1 > pipelines.size()) return;
currentPipelineIndex = pipelineNumber;
}
public int getStreamDivisor(){
return streamDivisor;
}
public void setStreamDivisor(int divisor){
streamDivisor = divisor;
}
public HashMap<Integer, Pipeline> getPipelines() {
return pipelines;

9
Main/src/main/java/com/chameleonvision/web/ServerHandler.java
View File

@@ -54,8 +54,10 @@ public class ServerHandler {
break;
}
case "cameraSettings": {
System.out.println("sadfsdf");
//change camera settings using a camera settings object
HashMap camSettings = (HashMap)entry.getValue();
CameraManager.getCurrentCamera().setFOV((float)camSettings.get("fov"));
CameraManager.getCurrentCamera().setStreamDivisor((Integer) camSettings.get("streamDivisor"));
CameraManager.getCurrentCamera().setCamVideoMode((Integer) camSettings.get("resolution"),true);
break;
}
case "command": {
@@ -67,6 +69,8 @@ public class ServerHandler {
CameraManager.setCurrentCamera((String) entry.getValue());
HashMap<String,Object> tmp = new HashMap<>();
tmp.put("pipeline",CameraManager.getCurrentCamera().getCurrentPipeline());
tmp.put("port", CameraManager.getCurrentCamera().getStreamPort());
tmp.put("resolutionList",CameraManager.getResolutionList());
broadcastMessage(tmp);
break;
}
@@ -74,7 +78,6 @@ public class ServerHandler {
CameraManager.getCurrentCamera().setCurrentPipelineIndex((Integer) entry.getValue());
HashMap<String,Object> tmp = new HashMap<>();
tmp.put("pipeline",getOrdinalPipeline());
//TODO Add cam settings to the map
broadcastMessage(tmp);
break;
}