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
+19 -3
View File
@@ -41,7 +41,15 @@
"name": <property name>
"value": <property value>
}
]
],
"stream": { // optional
"properties": [
{
"name": <stream property name>
"value": <stream property value>
}
]
}
}
]
}
@@ -58,6 +66,7 @@ struct CameraConfig {
std::string name;
std::string path;
wpi::json config;
wpi::json streamConfig;
};
std::vector<CameraConfig> cameraConfigs;
@@ -86,6 +95,9 @@ bool ReadCameraConfig(const wpi::json& config) {
return false;
}
// stream properties
if (config.count("stream") != 0) c.streamConfig = config.at("stream");
c.config = config;
cameraConfigs.emplace_back(std::move(c));
@@ -158,12 +170,16 @@ bool ReadConfig() {
cs::UsbCamera StartCamera(const CameraConfig& config) {
wpi::outs() << "Starting camera '" << config.name << "' on " << config.path
<< '\n';
auto camera = frc::CameraServer::GetInstance()->StartAutomaticCapture(
config.name, config.path);
cs::UsbCamera camera{config.name, config.path};
auto inst = frc::CameraServer::GetInstance();
auto server = inst->StartAutomaticCapture(camera);
camera.SetConfigJson(config.config);
camera.SetConnectionStrategy(cs::VideoSource::kConnectionKeepOpen);
if (config.streamConfig.is_object())
server.SetConfigJson(config.streamConfig);
return camera;
}