Add stream settings to webdash and examples (#61)

This commit is contained in:
Peter Johnson
2019-01-13 16:59:08 -08:00
committed by GitHub
parent 42d270870e
commit 03dae15ddf
7 changed files with 220 additions and 64 deletions
@@ -18,6 +18,8 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import edu.wpi.cscore.MjpegServer;
import edu.wpi.cscore.UsbCamera;
import edu.wpi.cscore.VideoSource;
import edu.wpi.first.cameraserver.CameraServer;
import edu.wpi.first.networktables.NetworkTableInstance;
@@ -47,7 +49,15 @@ import org.opencv.core.Mat;
"name": <property name>
"value": <property value>
}
]
],
"stream": { // optional
"properties": [
{
"name": <stream property name>
"value": <stream property value>
}
]
}
}
]
}
@@ -61,6 +71,7 @@ public final class Main {
public String name;
public String path;
public JsonObject config;
public JsonElement streamConfig;
}
public static int team;
@@ -99,6 +110,9 @@ public final class Main {
}
cam.path = pathElement.getAsString();
// stream properties
cam.streamConfig = config.get("stream");
cam.config = config;
cameraConfigs.add(cam);
@@ -167,14 +181,19 @@ public final class Main {
*/
public static VideoSource startCamera(CameraConfig config) {
System.out.println("Starting camera '" + config.name + "' on " + config.path);
VideoSource camera = CameraServer.getInstance().startAutomaticCapture(
config.name, config.path);
UsbCamera camera = new UsbCamera(config.name, config.path);
CameraServer inst = CameraServer.getInstance();
MjpegServer server = inst.startAutomaticCapture(camera);
Gson gson = new GsonBuilder().create();
camera.setConfigJson(gson.toJson(config.config));
camera.setConnectionStrategy(VideoSource.ConnectionStrategy.kKeepOpen);
if (config.streamConfig != null) {
server.setConfigJson(gson.toJson(config.streamConfig));
}
return camera;
}