Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CameraServer: Return MjpegServer from StartAutomaticCapture(VideoSource) (#1544)

Browse Source
This commit is contained in:
Peter Johnson
2019-01-11 16:44:49 -08:00
committed by GitHub
parent 453a9047e4
commit fdf298b172
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java
View File

@@ -537,10 +537,11 @@ public final class CameraServer {
*
* @param camera Camera
*/
public void startAutomaticCapture(VideoSource camera) {
public MjpegServer startAutomaticCapture(VideoSource camera) {
addCamera(camera);
VideoSink server = addServer("serve_" + camera.getName());
MjpegServer server = addServer("serve_" + camera.getName());
server.setSource(camera);
return server;
}
/**

4
cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
View File

@@ -538,10 +538,12 @@ cs::AxisCamera CameraServer::AddAxisCamera(const wpi::Twine& name,
return camera;
}
void CameraServer::StartAutomaticCapture(const cs::VideoSource& camera) {
cs::MjpegServer CameraServer::StartAutomaticCapture(
const cs::VideoSource& camera) {
AddCamera(camera);
auto server = AddServer(wpi::Twine("serve_") + camera.GetName());
server.SetSource(camera);
return server;
}
cs::CvSink CameraServer::GetVideo() {

2
cameraserver/src/main/native/include/cameraserver/CameraServer.h
View File

@@ -82,7 +82,7 @@ class CameraServer {
*
* @param camera Camera
*/
void StartAutomaticCapture(const cs::VideoSource& camera);
cs::MjpegServer StartAutomaticCapture(const cs::VideoSource& camera);
/**
* Adds an Axis IP camera.